From 3174d02d0cf2503de792c4016594cc89f648cc72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 2 Jun 2018 01:59:48 -0300
Subject: [PATCH 01/27] =?UTF-8?q?Fix=20ordena=C3=A7=C3=A3o=20de=20usu?=
 =?UTF-8?q?=C3=A1rios=20na=20busca?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/wp-content/themes/rhs/inc/search/search.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/wp-content/themes/rhs/inc/search/search.php b/public/wp-content/themes/rhs/inc/search/search.php
index 27718647..53460526 100644
--- a/public/wp-content/themes/rhs/inc/search/search.php
+++ b/public/wp-content/themes/rhs/inc/search/search.php
@@ -391,6 +391,12 @@ public function search_users($params = array()) {
             case 'votes':
                 $q_order_meta = RHSVote::META_TOTAL_VOTES;
                 break;
+
+            case 'last_login':
+                $q_order_meta = RHSLogin::META_KEY_LAST_LOGIN;
+                $q_order      = 'DESC';
+                $q_order_by   = 'meta_value';
+                break;
             
             default:
                 $q_order_by = 'display_name';

From f8349719ceca3b6efa4d9c7a623ea6c5a7ddd067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 2 Jun 2018 12:14:20 -0300
Subject: [PATCH 02/27] =?UTF-8?q?In=C3=ADcio=20de=20pequenas=20melhorias?=
 =?UTF-8?q?=20na=20p=C3=A1gina=20de=20publicar=20post?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wp-content/themes/rhs/assets/js/valida-form-registro.js   | 2 +-
 public/wp-content/themes/rhs/publicar-postagem.php            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/wp-content/themes/rhs/assets/js/valida-form-registro.js b/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
index 159214b8..ae629775 100644
--- a/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
+++ b/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
@@ -444,7 +444,7 @@ jQuery( function( $ ) {
             },
             messages: {
                 title: {
-                    required: 'Preencha o titulo.'
+                    required: 'Preencha o título.'
                 },
                 'category[]': {
                     required: 'Selecione uma categoria.'
diff --git a/public/wp-content/themes/rhs/publicar-postagem.php b/public/wp-content/themes/rhs/publicar-postagem.php
index 4f340c06..bd2879b2 100644
--- a/public/wp-content/themes/rhs/publicar-postagem.php
+++ b/public/wp-content/themes/rhs/publicar-postagem.php
@@ -8,7 +8,7 @@
             <?php if ($RHSPost->getId()): ?>
                 <input type="hidden" id="post_ID" name="post_ID" value="<?php echo $RHSPost->getId(); ?>" />
             <?php endif; ?>
-            <div class="col-xs-12 col-md-9">
+            <div class="col-md-9">
                 <h1 class="titulo-page"><?php echo $RHSPost->getId() ? 'Editar' : 'Criar'; ?> Post</h1>
                 <div class="tab-content">
                     <div id="verDados">
@@ -57,7 +57,7 @@
                     </div>
                 </div>
             </div>
-            <div class="col-xs-12 col-md-3">
+            <div class="col-md-3">
                 <div id="sidebar" class="sidebar hidden-print">
                     <aside id="class_post-1" class="widget widget_class_post">
                         <h2 class="widget-title">Classificar Post</h2>

From 52aa31cf2b79aa01532fb18dd1532303bd62ac9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimar=C3=A3es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 2 Jun 2018 12:43:09 -0300
Subject: [PATCH 03/27] Avoids PHP warning

---
 public/wp-content/themes/rhs/inc/message/message.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/wp-content/themes/rhs/inc/message/message.php b/public/wp-content/themes/rhs/inc/message/message.php
index 35cf7682..8cbee8fd 100644
--- a/public/wp-content/themes/rhs/inc/message/message.php
+++ b/public/wp-content/themes/rhs/inc/message/message.php
@@ -68,11 +68,12 @@ function messages(){
 
     }
 
-    function clear_messages(){
-
+    function clear_messages() {
         $class_name = get_class($this);
 
-        unset($_SESSION["messages_{$class_name}_{$this->getKey()}"]);
+        if (isset($_SESSION)) {
+            unset($_SESSION["messages_{$class_name}_{$this->getKey()}"]);
+        }
     }
 
 

From c4dd43c8a66248c5f6b61bbfd9210f13f3b1cc3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimar=C3=A3es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 2 Jun 2018 13:26:12 -0300
Subject: [PATCH 04/27] Melhorias gerais de UI ao criar post, e maior destaque
 para featured image

---
 .../rhs/assets/js/publicar_postagens.js       |  5 +++-
 .../themes/rhs/assets/scss/_page.scss         | 24 +++++++++++++++++++
 .../themes/rhs/assets/scss/_sidebar.scss      |  4 ++--
 .../themes/rhs/publicar-postagem.php          | 20 +++++++++-------
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/public/wp-content/themes/rhs/assets/js/publicar_postagens.js b/public/wp-content/themes/rhs/assets/js/publicar_postagens.js
index fcc8e8ec..41d2948d 100644
--- a/public/wp-content/themes/rhs/assets/js/publicar_postagens.js
+++ b/public/wp-content/themes/rhs/assets/js/publicar_postagens.js
@@ -31,13 +31,16 @@ jQuery(document).ready(function() {
     
     
     var ms = jQuery('#input-tags').magicSuggest({
-        placeholder: 'Select...',
+        placeholder: 'Digite...',
         allowFreeEntries: true,
         selectionPosition: 'bottom',
         selectionStacked: true,
         selectionRenderer: function(data){
             return data.name;
         },
+        minCharsRenderer: function(num) {
+            return "Digite no mínimo " + num + " caracteres!"
+        },
         data: post_vars.ajaxurl,
         dataUrlParams: { 
             action: 'get_tags', 
diff --git a/public/wp-content/themes/rhs/assets/scss/_page.scss b/public/wp-content/themes/rhs/assets/scss/_page.scss
index 4dac144a..935012c7 100644
--- a/public/wp-content/themes/rhs/assets/scss/_page.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_page.scss
@@ -38,4 +38,28 @@
     }
     padding: 13px 20px;
     margin: 20px 10px;
+}
+
+.rhs-publish-post {
+    .titulo-page {
+        box-shadow: none;
+        border-bottom: 1px solid;
+        margin-bottom: 0;
+    }
+
+    span.form-required {
+        color: darkred;
+    }
+
+    .set_img_destacada {
+        border: 1px solid $primeira_cor_texto;
+        color: $primeira_cor_texto;
+    }
+}
+
+.rhs-publish-sidebar {
+    label.strong {
+        color: black;
+        font-weight: bolder;
+    }
 }
\ No newline at end of file
diff --git a/public/wp-content/themes/rhs/assets/scss/_sidebar.scss b/public/wp-content/themes/rhs/assets/scss/_sidebar.scss
index bba7b2fb..b16dd0b4 100644
--- a/public/wp-content/themes/rhs/assets/scss/_sidebar.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_sidebar.scss
@@ -166,12 +166,12 @@
                 }
                 .publish_post_sidebox_city_state{
                     padding: 13px 20px 0 21px;
-                    border: 1px solid #F2F2F2;
+                    border-top: 1px solid #F2F2F2;
+                    border-bottom: 1px solid #F2F2F2;
                     margin-bottom: 10px;
                 }
                 .publish_post_sidebox{
                     padding: 13px 20px 0 7px;
-                    border: 1px solid #F2F2F2;
                     margin-bottom: 10px;
                     .checkbox{
                         label{
diff --git a/public/wp-content/themes/rhs/publicar-postagem.php b/public/wp-content/themes/rhs/publicar-postagem.php
index bd2879b2..b7a6e91c 100644
--- a/public/wp-content/themes/rhs/publicar-postagem.php
+++ b/public/wp-content/themes/rhs/publicar-postagem.php
@@ -8,14 +8,13 @@
             <?php if ($RHSPost->getId()): ?>
                 <input type="hidden" id="post_ID" name="post_ID" value="<?php echo $RHSPost->getId(); ?>" />
             <?php endif; ?>
-            <div class="col-md-9">
+            <div class="col-md-9 rhs-publish-post">
                 <h1 class="titulo-page"><?php echo $RHSPost->getId() ? 'Editar' : 'Criar'; ?> Post</h1>
                 <div class="tab-content">
                     <div id="verDados">
                         <div class="jumbotron perfil">
                             <div class="row">
-                                <div class="col-xs-12">
-                                    <div class="panel panel-default">
+                                <div class="col-md-12">
                                         <?php foreach ($RHSPosts->messages() as $type => $messages){ ?>
                                             <div class="alert alert-<?php echo $type == 'error' ? 'info' : 'success' ; ?>">
                                                 <?php foreach ($messages as $message){ ?>
@@ -28,8 +27,13 @@
                                             <div class="form-group">
                                                 <label for="title">Título <span class="form-required" title="Este campo é obrigatório.">*</span></label>
                                                 <input class="form-control" type="text" id="title" name="title" size="60" maxlength="254" value="<?php echo $RHSPost->getTitle(); ?>">
-                                                <input class="form-control" type="hidden" value="<?php echo $RHSPosts->getKey(); ?>" name="post_user_wp" />
+                                                <input type="hidden" value="<?php echo $RHSPosts->getKey(); ?>" name="post_user_wp" />
                                             </div>
+
+                                            <div class="form-group">
+                                                <button type="button" class="btn btn-default form-submit dest_visu set_img_destacada">ESCOLHER IMAGEM DESTACADA</button>
+                                            </div>
+
                                             <div class="form-group">
                                                 <label for="descricao">Conteúdo</label>
                                                 <?php
@@ -50,7 +54,6 @@
                                                 ?>
                                             </div>
                                         </div>
-                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -58,7 +61,7 @@
                 </div>
             </div>
             <div class="col-md-3">
-                <div id="sidebar" class="sidebar hidden-print">
+                <div id="sidebar" class="sidebar hidden-print rhs-publish-sidebar">
                     <aside id="class_post-1" class="widget widget_class_post">
                         <h2 class="widget-title">Classificar Post</h2>
                         <div class="panel">
@@ -83,7 +86,7 @@
                                     ) ); ?>
                                 </div>
                                 <div class="form-group form-checkbox publish_post_sidebox">
-                                <label>Categorias</label>
+                                <label class="strong">Categorias</label>
                                 <?php 
                                     $category = get_categories();
                                     foreach($category as $cat){
@@ -101,7 +104,7 @@
                                 <?php if($RHSPost->getStatus() == 'private' || $comunidades) { ?>
 
                                     <div class="form-group form-checkbox publish_post_sidebox">
-                                        <label>Publicar em</label>
+                                        <label class="strong">Publicar em</label>
                                     
                                         <div>
                                             <input <?php echo (!$RHSPost->getComunities() || $RHSPost->getStatus() != 'private') ? 'checked' : ''; ?> type="checkbox" class="uniform" id="comunity-status" name="comunity-status[]" value="public">
@@ -125,7 +128,6 @@
                                     <div id="img_destacada_preview">
                                         <?php if ($RHSPost->getFeaturedImageId()) echo $RHSPost->getFeaturedImage(array( 200, 200)); ?>
                                     </div>
-                                    <button type="button" class="btn btn-default form-submit dest_visu set_img_destacada">DEFINIR IMAGEM DESTACADA</button>
                                     <?php if(!$RHSPost->getId() || $RHSPost->getStatus() == 'draft'){ ?>
                                     <button type="submit" name="status" value="draft" class="btn btn-default form-submit rasc_visu">SALVAR RASCUNHO</button>
                                     <?php } ?>

From 080247beca50dcc403e99afa323199ec99d4aef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimar=C3=A3es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Wed, 6 Jun 2018 15:31:15 -0300
Subject: [PATCH 05/27] =?UTF-8?q?Ordena=C3=A7=C3=A3o=20padr=C3=A3o=20por?=
 =?UTF-8?q?=20=C3=BAltimo=20login=20(#ref=20275)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/wp-content/themes/rhs/inc/search/search.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/wp-content/themes/rhs/inc/search/search.php b/public/wp-content/themes/rhs/inc/search/search.php
index 53460526..a0357d6b 100644
--- a/public/wp-content/themes/rhs/inc/search/search.php
+++ b/public/wp-content/themes/rhs/inc/search/search.php
@@ -393,15 +393,11 @@ public function search_users($params = array()) {
                 break;
 
             case 'last_login':
+            default:
                 $q_order_meta = RHSLogin::META_KEY_LAST_LOGIN;
                 $q_order      = 'DESC';
                 $q_order_by   = 'meta_value';
                 break;
-            
-            default:
-                $q_order_by = 'display_name';
-                $q_order = 'ASC';
-                break;
         }
 
         if (!empty($q_order_meta)) {

From 7e1be3db971842042eef5d53fba520d13e0f84c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Thu, 7 Jun 2018 17:10:27 -0300
Subject: [PATCH 06/27] =?UTF-8?q?Refatora=20topo=20da=20p=C3=A1gina=20de?=
 =?UTF-8?q?=20busca=20(posts=20e=20usu=C3=A1rios),=20incluindo=20fix=20de?=
 =?UTF-8?q?=20quebra=20de=20layout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../themes/rhs/assets/scss/_busca-page.scss   | 23 ++++--
 .../rhs/partes-templates/search_common.php    | 78 +++++++++++++++++++
 public/wp-content/themes/rhs/search-users.php | 46 +----------
 public/wp-content/themes/rhs/search.php       | 50 +-----------
 4 files changed, 101 insertions(+), 96 deletions(-)
 create mode 100644 public/wp-content/themes/rhs/partes-templates/search_common.php

diff --git a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
index 48435ebd..2746eba5 100644
--- a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
@@ -28,10 +28,10 @@
     #posts, #user {
         .formulario {
             padding: 15px 0;
-            margin: 15px 0;
-            margin-bottom: 0;
+            //margin: 15px 5px;
+            margin-bottom: 10px;
             background: transparent;
-            border: 1px solid lightgray;
+            //border: 1px solid lightgray;
 
             label { color: $primeira_cor_fundo;  }
 
@@ -105,18 +105,22 @@
                 transition: all 0.3s ease;
             }
         }
-        .resultado{
+        .resultado {
             padding: 15px;
             padding-top: 0;
-            .retorno{
+
+            .search-header-common {
                 background: aliceblue;
+                border-bottom: 1px solid $primeira_cor_fundo;
+            }
+
+            .retorno {
                 padding: 22px;
                 margin: 0 -15px 0 15px;
                 border-top-left-radius: 8px;
                 font-weight: 500;
             }
-            .classificar{
-                background: aliceblue;
+            .classificar {
                 margin: 0 15px 0 -15px;
                 padding: 14px;
                 border-top-right-radius: 8px;
@@ -136,6 +140,11 @@
             }
        }
     }
+
+    div.membros {
+        float: left;
+        width: 100%;
+    }
 }
 
 #exportModal{
diff --git a/public/wp-content/themes/rhs/partes-templates/search_common.php b/public/wp-content/themes/rhs/partes-templates/search_common.php
new file mode 100644
index 00000000..a0042ac3
--- /dev/null
+++ b/public/wp-content/themes/rhs/partes-templates/search_common.php
@@ -0,0 +1,78 @@
+<div class="col-md-12 search-header-common">
+
+    <div class="col-md-6 retorno">
+
+        <?php if(count($_GET)) { ?>
+            <div class="label-rhs">
+                <?php exibir_resultado_post(); //Mostra o resultado da busca dos posts ?>
+            </div>
+        <?php } ?>
+
+    </div>
+
+    <div class="col-md-6 classificar">
+
+        <div class="pull-right">
+            <div class="dropdown">
+                <?php RHSSearch::show_button_download_report(); ?>
+
+                <?php if (isset($users) && $users instanceof WP_User_Query) : ?>
+                    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                        Ordenar por
+                        <?php
+                        if(RHSSearch::get_param('rhs_order') == 'name')
+                            echo 'Nome';
+                        elseif(RHSSearch::get_param('rhs_order') == 'register_date')
+                            echo 'Data de Cadastro';
+                        elseif(RHSSearch::get_param('rhs_order') == 'posts')
+                            echo 'Número de Posts';
+                        elseif(RHSSearch::get_param('rhs_order') == 'votes')
+                            echo 'Número de Votos';
+                        else
+                            echo '';
+                        ?>
+                        <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                        <li><a href="<?php echo RHSSearch::get_search_neworder_urls('name'); ?>">Nome</a></li>
+                        <li><a href="<?php echo RHSSearch::get_search_neworder_urls('register_date'); ?>">Data de Cadastro</a></li>
+                        <li><a href="<?php echo RHSSearch::get_search_neworder_urls('posts'); ?>">Número de Posts</a></li>
+                        <li><a href="<?php echo RHSSearch::get_search_neworder_urls('votes'); ?>">Número de Votos</a></li>
+                        <li><a href="<?php echo RHSSearch::get_search_neworder_urls('last_login'); ?>">Último Login</a></li>
+                    </ul>
+                <?php else: ?>
+
+                    <button class="btn btn-default dropdown-toggle" type="button" id="busca_filtro" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                        Classificar por
+                        <?php
+                        if(RHSSearch::get_param('rhs_order') == 'date')
+                            echo 'Data';
+                        elseif(RHSSearch::get_param('rhs_order') == 'comments')
+                            echo 'Comentários';
+                        elseif(RHSSearch::get_param('rhs_order') == 'votes')
+                            echo 'Votos';
+                        elseif(RHSSearch::get_param('rhs_order') == 'views')
+                            echo 'Visualizações';
+                        elseif(RHSSearch::get_param('rhs_order') == 'shares')
+                            echo 'Compartilhamentos';
+                        else
+                            echo '';
+                        ?>
+                        <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                        <li><a href="<?php echo RHSSearch::get_search_neworder_urls('date'); ?>">Data</a></li>
+                        <li><a href="<?php echo RHSSearch::get_search_neworder_urls('comments'); ?>">Comentários</a></li>
+                        <li><a href="<?php echo RHSSearch::get_search_neworder_urls('votes'); ?>">Votos</a></li>
+                        <li><a href="<?php echo RHSSearch::get_search_neworder_urls('views'); ?>">Visualizações</a></li>
+                        <li><a href="<?php echo RHSSearch::get_search_neworder_urls('shares'); ?>">Compartilhamentos</a></li>
+                    </ul>
+                    <br>
+
+                <?php endif; ?>
+
+            </div>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/public/wp-content/themes/rhs/search-users.php b/public/wp-content/themes/rhs/search-users.php
index 42f298be..711aae8c 100644
--- a/public/wp-content/themes/rhs/search-users.php
+++ b/public/wp-content/themes/rhs/search-users.php
@@ -20,49 +20,9 @@
                         <?php get_template_part("partes-templates/header_search_users"); ?>
                     </div>
                     <div class="row resultado">
-                        <div class="row">
-                            <div class="col-xs-6 retorno">
-                                <?php if(count($_GET)) {?>
-                                    <div class="label-rhs"> 
-                                    <?php
-                                        //Mostra o resultado da busca dos usuarios
-                                        exibir_resultado_user();
-                                        
-                                    ?>
-                                    </div>
-                                <?php }?>
-                            </div>
-                            <div class="col-xs-6 classificar">
-                                <div class="pull-right">
-                                    <div class="dropdown">
-                                        <?php RHSSearch::show_button_download_report(); ?>
-                                        <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                                        Ordenar por
-                                        <?php
-                                            if(RHSSearch::get_param('rhs_order') == 'name')
-                                                echo 'Nome';
-                                            elseif(RHSSearch::get_param('rhs_order') == 'register_date')
-                                                echo 'Data de Cadastro';
-                                            elseif(RHSSearch::get_param('rhs_order') == 'posts')
-                                                echo 'Número de Posts';
-                                            elseif(RHSSearch::get_param('rhs_order') == 'votes')
-                                                echo 'Número de Votos';
-                                            else
-                                                echo '';
-                                        ?>
-                                        <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                                            <li><a href="<?php echo RHSSearch::get_search_neworder_urls('name'); ?>">Nome</a></li>
-                                            <li><a href="<?php echo RHSSearch::get_search_neworder_urls('register_date'); ?>">Data de Cadastro</a></li>
-                                            <li><a href="<?php echo RHSSearch::get_search_neworder_urls('posts'); ?>">Número de Posts</a></li>
-                                            <li><a href="<?php echo RHSSearch::get_search_neworder_urls('votes'); ?>">Número de Votos</a></li>
-                                            <li><a href="<?php echo RHSSearch::get_search_neworder_urls('last_login'); ?>">Último Login</a></li>
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>                            
-                        </div>
+
+                        <?php include_once ("partes-templates/search_common.php"); ?>
+
                         <div class="row membros">
                             <?php if (!empty($users->results)): ?>
                                 <?php foreach ($users->results as $user): ?>
diff --git a/public/wp-content/themes/rhs/search.php b/public/wp-content/themes/rhs/search.php
index d639074c..04091a25 100644
--- a/public/wp-content/themes/rhs/search.php
+++ b/public/wp-content/themes/rhs/search.php
@@ -17,54 +17,12 @@
                     </div>
                     
                     <div class="row resultado">
-                        <div class="row">
+                        <?php include_once ("partes-templates/search_common.php"); ?>
+                    </div>
 
-                            <div class="col-xs-6 retorno">
-                                <?php if(count($_GET)) {?>
-                                    <div class="label-rhs">
-                                        <?php
-                                            //Mostra o resultado da busca dos posts
-                                            exibir_resultado_post();
-                                        ?>
-                                    </div>
-                                <?php } ?>
-                            </div>
-                            <div class="col-xs-6 classificar">
+                    <?php get_template_part( 'partes-templates/loop-posts'); ?>
+                </div>
 
-                                <div class="pull-right">
-                                    <div class="dropdown">
-                                        <?php RHSSearch::show_button_download_report(); ?>
-                                        <button class="btn btn-default dropdown-toggle" type="button" id="busca_filtro" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                                        Classificar por
-                                        <?php
-                                            if(RHSSearch::get_param('rhs_order') == 'date')
-                                                echo 'Data';
-                                            elseif(RHSSearch::get_param('rhs_order') == 'comments')
-                                                echo 'Comentários';
-                                            elseif(RHSSearch::get_param('rhs_order') == 'votes')
-                                                echo 'Votos';
-                                            elseif(RHSSearch::get_param('rhs_order') == 'views')
-                                                echo 'Visualizações';
-                                            elseif(RHSSearch::get_param('rhs_order') == 'shares')
-                                                echo 'Compartilhamentos';
-                                            else
-                                                echo '';
-                                        ?>
-                                        <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                                            <li><a href="<?php echo RHSSearch::get_search_neworder_urls('date'); ?>">Data</a></li>
-                                            <li><a href="<?php echo RHSSearch::get_search_neworder_urls('comments'); ?>">Comentários</a></li>
-                                            <li><a href="<?php echo RHSSearch::get_search_neworder_urls('votes'); ?>">Votos</a></li>
-                                            <li><a href="<?php echo RHSSearch::get_search_neworder_urls('views'); ?>">Visualizações</a></li>
-                                            <li><a href="<?php echo RHSSearch::get_search_neworder_urls('shares'); ?>">Compartilhamentos</a></li>
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>                            
-                        </div>
-                        <?php get_template_part( 'partes-templates/loop-posts'); ?>
-                    </div>
                 </div>
             </div>
         </div>

From b61fd73d7b52e9bbdfb14e8d041bab73989f3567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 9 Jun 2018 00:41:42 -0300
Subject: [PATCH 07/27] Melhora consideravelmente layout da busca de usuarios

---
 .../themes/rhs/assets/scss/_busca-page.scss   | 21 ++++++++++---------
 .../themes/rhs/assets/scss/_variavels.scss    |  4 ++++
 .../partes-templates/header_search_users.php  | 20 +++++++-----------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
index 2746eba5..9b8f5eeb 100644
--- a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
@@ -4,6 +4,9 @@
 *
 ************/
 .busca-page {
+    form {
+        padding-top: 10px;
+    }
     .nav-tabs{
         li{
             a{
@@ -32,6 +35,8 @@
             margin-bottom: 10px;
             background: transparent;
             //border: 1px solid lightgray;
+            float: left;
+            width: 100%;
 
             label { color: $primeira_cor_fundo;  }
 
@@ -45,9 +50,7 @@
                 .col2{
                     text-align: center;
                 }
-                #municipio{
-                    width: 194px !important;
-                }
+                //#municipio{  width: 194px !important;  }
             }
             @media only screen and (width: 1024px) and (height: 1366px){
                 .form-inline{
@@ -95,9 +98,9 @@
             }
             .filtro{
                 float: right;
-                margin: 10px 30px 0 0;
+                margin: 0 15px 0 0;
                 padding: 10px 16px;
-                box-shadow: 3px 4px 0px 0px #d8d8d8;
+                box-shadow: 1px 3px 0px 0px #d8d8d8;
                 -webkit-transition: all 0.3s ease;
                 -moz-transition: all 0.3s ease;
                 -ms-transition: all 0.3s ease;
@@ -127,17 +130,15 @@
             }
         }
     }
-    #user{
+    #user {
        @media only screen and (min-width: 780px){
-            .input-daterange{
+            .input-daterange {
                 input{
                     margin-right: 15px !important;
                     width: 110px;
                 }
             }
-            #keyword{
-                width: 230px !important;
-            }
+            // #keyword {  width: 230px !important; }
        }
     }
 
diff --git a/public/wp-content/themes/rhs/assets/scss/_variavels.scss b/public/wp-content/themes/rhs/assets/scss/_variavels.scss
index 959a0a16..b16508c2 100644
--- a/public/wp-content/themes/rhs/assets/scss/_variavels.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_variavels.scss
@@ -98,4 +98,8 @@ $seguir_mensagem_mobile: inline-grid;
         margin: 0;
         background: white;
     }
+}
+
+.no-padding {
+    padding: 0 !important;
 }
\ No newline at end of file
diff --git a/public/wp-content/themes/rhs/partes-templates/header_search_users.php b/public/wp-content/themes/rhs/partes-templates/header_search_users.php
index 945a8cfe..2fded896 100644
--- a/public/wp-content/themes/rhs/partes-templates/header_search_users.php
+++ b/public/wp-content/themes/rhs/partes-templates/header_search_users.php
@@ -1,17 +1,13 @@
-<div class="container">
+<div class="container col-md-12 no-padding">
     <form action="<?php echo home_url('/'); ?>busca/usuarios/" id="filter">
-        <div class="col-xs-12 col-sm-7">
-            <div class="form-inline col-xs-12">    
-                <?php RHSSearch::render_uf_city_select(); ?>
-            </div>
+
+        <div class="col-md-6 no-padding">
+            <?php RHSSearch::render_uf_city_select(); ?>
         </div>
-        <div class="col-xs-12 col-sm-5">
-            <div class="form-inline col-xs-12">
-                <div class="form-group">
-                    <label for="keyword" class="control-label">Nome ou E-mail</label>
-                    <input type="text" name="keyword" id="keyword" class="form-control" value="<?php echo RHSSearch::get_param('keyword'); ?>">
-                </div>
-            </div>
+
+        <div class="col-md-6 form-group ">
+            <label for="keyword" class="control-label">Nome ou E-mail</label>
+            <input type="text" name="keyword" id="keyword" class="form-control" value="<?php echo RHSSearch::get_param('keyword'); ?>">
         </div>
 
         <?php echo RHSSearch::getSearchButtons(); ?>

From 287bda34d34d27ac42004be34cfc33f39c9c1bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 9 Jun 2018 02:05:21 -0300
Subject: [PATCH 08/27] =?UTF-8?q?Melhor=20feedback=20ao=20usu=C3=A1rio=20p?=
 =?UTF-8?q?ara=20resultados=20n=C3=A3o=20encontrados?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wp-content/themes/rhs/inc/search/search.php |  2 +-
 .../themes/rhs/partes-templates/none.php        | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/public/wp-content/themes/rhs/inc/search/search.php b/public/wp-content/themes/rhs/inc/search/search.php
index a0357d6b..73f9bf6b 100644
--- a/public/wp-content/themes/rhs/inc/search/search.php
+++ b/public/wp-content/themes/rhs/inc/search/search.php
@@ -837,7 +837,7 @@ function exibir_resultado_post() {
         if ($final > $total) $final = $total;
         echo "Exibindo $initial a $final de $total resultados";
     } else {
-        _e("Nenhum post encontrado com estes termos de busca!", "rhs");
+        _e("Nenhum post encontrado com estes filtros de busca!", "rhs");
     }
 }
 
diff --git a/public/wp-content/themes/rhs/partes-templates/none.php b/public/wp-content/themes/rhs/partes-templates/none.php
index b881f27a..2c1c47aa 100644
--- a/public/wp-content/themes/rhs/partes-templates/none.php
+++ b/public/wp-content/themes/rhs/partes-templates/none.php
@@ -1,13 +1,4 @@
-<div class="row">
-    <div class="col-md-12 col-xs-12 col-md-12 postagens">
-        <div class="wrapper-content">
-            <h4 class="titulo-page">
-                <?php _e( 'Não há posts', 'rhs' ); ?>
-                <!--<span style="float: right; margin-top: -10px"><?php //get_search_form(); ?></span>-->
-            </h4>
-            <p class="postnone">
-                <?php //_e( 'Parece que não podemos encontrar o que você está procurando. Talvez a pesquisa possa ajudar.', 'rhs' ); ?>
-            </p>
-        </div>
-    </div>
-</div>
+ <div class="col-md-12 no-posts">
+     <?php _e( 'Nenhum post encontrado', 'rhs' ); ?>
+ </div>
+

From b57d78fb2e4de1ad14cc39c6a74fe71fadadbff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 9 Jun 2018 02:06:15 -0300
Subject: [PATCH 09/27] Melhora layout do header de busca por posts

---
 .../themes/rhs/assets/scss/_busca-page.scss   | 10 +++-
 .../themes/rhs/assets/scss/_page.scss         | 10 ++++
 .../partes-templates/header_search_post.php   | 57 +++++++++----------
 .../partes-templates/header_search_users.php  |  2 +-
 public/wp-content/themes/rhs/search.php       |  2 +-
 5 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
index 9b8f5eeb..dacc26f6 100644
--- a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
@@ -5,7 +5,15 @@
 ************/
 .busca-page {
     form {
-        padding-top: 10px;
+        padding-top: 10px !important;
+
+        .uf-city {
+            padding-bottom: 20px;
+        }
+
+        .tags-categories {
+            padding-top: 10px !important;
+        }
     }
     .nav-tabs{
         li{
diff --git a/public/wp-content/themes/rhs/assets/scss/_page.scss b/public/wp-content/themes/rhs/assets/scss/_page.scss
index 935012c7..aca59404 100644
--- a/public/wp-content/themes/rhs/assets/scss/_page.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_page.scss
@@ -62,4 +62,14 @@
         color: black;
         font-weight: bolder;
     }
+}
+
+.no-posts {
+    color: black;
+    background: white;
+    float: left;
+    width: 100%;
+    text-align: center;
+    padding: 20px 0;
+    border-bottom: 1px solid;
 }
\ No newline at end of file
diff --git a/public/wp-content/themes/rhs/partes-templates/header_search_post.php b/public/wp-content/themes/rhs/partes-templates/header_search_post.php
index b516e1b8..f02e656b 100644
--- a/public/wp-content/themes/rhs/partes-templates/header_search_post.php
+++ b/public/wp-content/themes/rhs/partes-templates/header_search_post.php
@@ -1,34 +1,33 @@
-<div class="container">
-    <div class="row">
-        <form action="<?php echo home_url('/'); ?>busca/" id="filter">
+<div class="container no-padding">
+    <form action="<?php echo home_url('/'); ?>busca/" id="filter" class="col-md-12 no-padding">
 
-            <div class="col-xs-12 col-sm-7">
+        <div class="col-md-6 no-padding">
 
-                <div class="form-inline uf-city">
-                    <?php RHSSearch::render_uf_city_select(); ?>
+            <div class="uf-city col-md-12 no-padding"> <?php RHSSearch::render_uf_city_select(); ?> </div>
+
+            <div class="col-md-12 no-padding tags-categories">
+                <div class="form-group col-md-6">
+                    <label for="tag" class="control-label">Tags</label>
+                    <input type="text" value="" class="form-control" id="input-tag" placeholder="Filtre por tags do post" name="tag">
                 </div>
 
-                <div class="form-inline">
-                    <div class="form-group col-md-5">
-                        <label for="tag" class="control-label">Tags</label>
-                        <input type="text" value="" class="form-control" id="input-tag" placeholder="Tags" name="tag">
-                    </div>
-                    <div class="form-group col-md-7">
-                        <label for="categoria" class="control-label">Categoria</label>
-                        <?php wp_dropdown_categories( [
-                            'show_option_none' => 'Selecione uma Categoria',
-                            'selected' => RHSSearch::get_param('cat'),
-                            'option_none_value' => '',
-                            'orderby' => 'name',
-                            'class' => 'form-control '
-                        ] ); ?>
+                <div class="form-group col-md-6">
+                    <label for="categoria" class="control-label">Categoria</label>
+                    <?php
+                    $dropdown_options = [
+                        'show_option_none' => 'Filtre por categoria',
+                        'selected' => RHSSearch::get_param('cat'),
+                        'option_none_value' => '',
+                        'orderby' => 'name',
+                        'class' => 'form-control'
+                    ];
+                    wp_dropdown_categories($dropdown_options); ?>
                     </div>
                 </div>
 
-            </div>
-
-            <div class="col-xs-12 col-sm-5">
+        </div>
 
+            <div class="col-md-6">
                 <div class="form-inline col-md-12">
                     <label for="date" class="control-label">Data</label>
                     <div class="form-group date-range-container">
@@ -54,14 +53,10 @@
                 </div>
 
             </div>
-            <div class="row">
-                <div class="col-xs-12">
-                    <div id="custom-ctn"></div>
-                </div>
-            </div>
 
-            <?php echo RHSSearch::getSearchButtons(); ?>
+        <div class="row"> <div class="col-xs-12" id="custom-ctn"></div> </div>
+
+        <?php echo RHSSearch::getSearchButtons(); ?>
 
-        </form>
-    </div>
+    </form>
 </div>
\ No newline at end of file
diff --git a/public/wp-content/themes/rhs/partes-templates/header_search_users.php b/public/wp-content/themes/rhs/partes-templates/header_search_users.php
index 2fded896..612ff384 100644
--- a/public/wp-content/themes/rhs/partes-templates/header_search_users.php
+++ b/public/wp-content/themes/rhs/partes-templates/header_search_users.php
@@ -5,7 +5,7 @@
             <?php RHSSearch::render_uf_city_select(); ?>
         </div>
 
-        <div class="col-md-6 form-group ">
+        <div class="col-md-6 form-group">
             <label for="keyword" class="control-label">Nome ou E-mail</label>
             <input type="text" name="keyword" id="keyword" class="form-control" value="<?php echo RHSSearch::get_param('keyword'); ?>">
         </div>
diff --git a/public/wp-content/themes/rhs/search.php b/public/wp-content/themes/rhs/search.php
index 04091a25..efe9724f 100644
--- a/public/wp-content/themes/rhs/search.php
+++ b/public/wp-content/themes/rhs/search.php
@@ -2,7 +2,7 @@
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="panel panel-default busca-page" style="padding: 10px;">
+        <div class="panel panel-default busca-page">
             <!-- Nav tabs -->
             <ul class="nav nav-tabs" role="tablist">
                 <li role="presentation" class="active"><a href="#posts" aria-controls="posts" role="tab" data-toggle="tab">Posts</a></li>

From 4b5280cfe6d2c2ce3103a3e9da6a60bc17905cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 9 Jun 2018 02:30:17 -0300
Subject: [PATCH 10/27] =?UTF-8?q?Sugest=C3=A3o=20de=20frase=20mais=20asser?=
 =?UTF-8?q?tiva=20com=20o=20que=20o=20usu=C3=A1rio=20poder=C3=A1=20encontr?=
 =?UTF-8?q?ar=20na=20busca?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/wp-content/themes/rhs/searchform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/wp-content/themes/rhs/searchform.php b/public/wp-content/themes/rhs/searchform.php
index 2f53f84d..bbda0cb8 100644
--- a/public/wp-content/themes/rhs/searchform.php
+++ b/public/wp-content/themes/rhs/searchform.php
@@ -11,7 +11,7 @@
 <form autocomplete="off" class="form-search-rhs navbar-form navbar-left" role="search" action="<?php echo home_url($search_form_action); ?>" method="get" id="menuPesquisa">
     <div class="form-group" style="display: inline;">
         <div class="input-group">
-            <input type="text" class="form-control" placeholder="Digite aqui o que você procura." size="15" maxlength="128" name="s" id="search" value="<?php echo RHSSearch::get_param('keyword'); ?>">
+            <input type="text" class="form-control" placeholder="Busque posts ou usuários" size="15" maxlength="128" name="s" id="search" value="<?php echo RHSSearch::get_param('keyword'); ?>">
             <span class="input-group-btn">
                 <button type="submit" class="btn btn-default">
                     <span class="glyphicon glyphicon-search"></span>

From 7c01b78d17e841df290777b6ed81b82005f027f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 9 Jun 2018 03:00:30 -0300
Subject: [PATCH 11/27] Finaliza melhoria do layout do header de busca de posts

---
 .../wp-content/themes/rhs/assets/scss/_busca-page.scss | 10 +++++++++-
 .../themes/rhs/partes-templates/header_search_post.php |  5 +++--
 public/wp-content/themes/rhs/partes-templates/none.php |  3 +--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
index dacc26f6..35949612 100644
--- a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
@@ -104,7 +104,7 @@
                     padding: 0;
                 }
             }
-            .filtro{
+            .filtro {
                 float: right;
                 margin: 0 15px 0 0;
                 padding: 10px 16px;
@@ -138,6 +138,14 @@
             }
         }
     }
+    #posts {
+        .formulario {
+            .filtro {
+                margin-right: 25px;
+                margin-top: 10px;
+            }
+        }
+    }
     #user {
        @media only screen and (min-width: 780px){
             .input-daterange {
diff --git a/public/wp-content/themes/rhs/partes-templates/header_search_post.php b/public/wp-content/themes/rhs/partes-templates/header_search_post.php
index f02e656b..f78a2066 100644
--- a/public/wp-content/themes/rhs/partes-templates/header_search_post.php
+++ b/public/wp-content/themes/rhs/partes-templates/header_search_post.php
@@ -28,10 +28,11 @@
         </div>
 
             <div class="col-md-6">
-                <div class="form-inline col-md-12">
+                <div class="col-md-12">
                     <label for="date" class="control-label">Data</label>
                     <div class="form-group date-range-container">
                         <div class="input-group input-daterange" style="width: 100%">
+                            <div class="input-group-addon">a partir de</div>
                             <input type="text" class="form-control" value="<?php echo RHSSearch::get_param('date_from'); ?>" name="date_from">
                             <div class="input-group-addon">até</div>
                             <input type="text" class="form-control" value="<?php echo RHSSearch::get_param('date_to'); ?>" name="date_to">
@@ -39,7 +40,7 @@
                     </div>
                 </div>
 
-                <div class="form-inline col-md-12" style="margin-top: 10px;">
+                <div class="col-md-12" style="margin-top: 10px;">
                     <label for="keyword" class="control-label palavra-chave">Palavra Chave</label>
                     <div class="keyword-container">
                         <input type="text" name="keyword" id="keyword" class="form-control" value="<?php echo RHSSearch::get_param('keyword'); ?>">
diff --git a/public/wp-content/themes/rhs/partes-templates/none.php b/public/wp-content/themes/rhs/partes-templates/none.php
index 2c1c47aa..6655f95b 100644
--- a/public/wp-content/themes/rhs/partes-templates/none.php
+++ b/public/wp-content/themes/rhs/partes-templates/none.php
@@ -1,4 +1,3 @@
  <div class="col-md-12 no-posts">
      <?php _e( 'Nenhum post encontrado', 'rhs' ); ?>
- </div>
-
+ </div>
\ No newline at end of file

From 9f3aa03ea66f95b2972ed7e2e5ab43964dea9c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 9 Jun 2018 03:10:42 -0300
Subject: [PATCH 12/27] Melhora responsividade da busca

---
 public/wp-content/themes/rhs/assets/scss/_busca-page.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
index 35949612..5985cdc0 100644
--- a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
@@ -120,9 +120,11 @@
             padding: 15px;
             padding-top: 0;
 
-            .search-header-common {
-                background: aliceblue;
-                border-bottom: 1px solid $primeira_cor_fundo;
+            @media only screen and (min-width: 991px) {
+                .search-header-common {
+                    background: aliceblue;
+                    border-bottom: 1px solid $primeira_cor_fundo;
+                }
             }
 
             .retorno {

From 10a8bced381454564f178326a5fa14ad2f1c7654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Fri, 15 Jun 2018 00:39:01 -0300
Subject: [PATCH 13/27] Melhora equidade de layout entre pagina de busca
 usuarios e posts

---
 public/wp-content/themes/rhs/assets/scss/_busca-page.scss | 1 +
 public/wp-content/themes/rhs/search-users.php             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
index 5985cdc0..50a6049f 100644
--- a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
@@ -4,6 +4,7 @@
 *
 ************/
 .busca-page {
+    padding: 10px;
     form {
         padding-top: 10px !important;
 
diff --git a/public/wp-content/themes/rhs/search-users.php b/public/wp-content/themes/rhs/search-users.php
index 711aae8c..1b124276 100644
--- a/public/wp-content/themes/rhs/search-users.php
+++ b/public/wp-content/themes/rhs/search-users.php
@@ -6,7 +6,7 @@
 ?>
 <div class="row">
     <div class="col-xs-12">
-        <div class="panel panel-default busca-page" style="padding: 10px;">
+        <div class="panel panel-default busca-page">
             <!-- Nav tabs -->
             <ul class="nav nav-tabs" role="tablist">
                 <li role="presentation"><a href="<?php echo RHSSearch::get_search_url(); ?>">Posts</a></li>

From 43ad1e39b6bb499a8c319066237c5b109c0c864b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Fri, 15 Jun 2018 00:46:40 -0300
Subject: [PATCH 14/27] Equaliza distancia do padding do resultado de busca por
 usuarios

---
 public/wp-content/themes/rhs/search-users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/wp-content/themes/rhs/search-users.php b/public/wp-content/themes/rhs/search-users.php
index 1b124276..a98f3ae8 100644
--- a/public/wp-content/themes/rhs/search-users.php
+++ b/public/wp-content/themes/rhs/search-users.php
@@ -23,7 +23,7 @@
 
                         <?php include_once ("partes-templates/search_common.php"); ?>
 
-                        <div class="row membros">
+                        <div class="membros">
                             <?php if (!empty($users->results)): ?>
                                 <?php foreach ($users->results as $user): ?>
                                     <div class="col-md-4 col-xs-12 well-disp" data-userid="<?php echo $user->ID; ?>" data-id="<?php echo $user->ID; ?>">

From 9c6b1a024cd26fe11ead215f36fe57d1e67af70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Fri, 15 Jun 2018 01:36:20 -0300
Subject: [PATCH 15/27] =?UTF-8?q?Remove=20classes=20e=20indenta=C3=A7?=
 =?UTF-8?q?=C3=B5es=20desnecess=C3=A1rias?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../themes/rhs/assets/scss/_busca-page.scss   |   2 +-
 public/wp-content/themes/rhs/search-users.php | 104 +++++++++---------
 public/wp-content/themes/rhs/search.php       |  42 +++----
 3 files changed, 70 insertions(+), 78 deletions(-)

diff --git a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
index 50a6049f..08b5dba4 100644
--- a/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
@@ -135,8 +135,8 @@
                 font-weight: 500;
             }
             .classificar {
-                margin: 0 15px 0 -15px;
                 padding: 14px;
+                padding-right: 0;
                 border-top-right-radius: 8px;
             }
         }
diff --git a/public/wp-content/themes/rhs/search-users.php b/public/wp-content/themes/rhs/search-users.php
index a98f3ae8..5597951b 100644
--- a/public/wp-content/themes/rhs/search-users.php
+++ b/public/wp-content/themes/rhs/search-users.php
@@ -4,70 +4,68 @@
 // Resultado da busca
 $users = $RHSSearch->search_users();
 ?>
-<div class="row">
-    <div class="col-xs-12">
-        <div class="panel panel-default busca-page">
-            <!-- Nav tabs -->
-            <ul class="nav nav-tabs" role="tablist">
-                <li role="presentation"><a href="<?php echo RHSSearch::get_search_url(); ?>">Posts</a></li>
-                <li role="presentation" class="active"><a href="#user" aria-controls="user" role="tab" data-toggle="tab">Usuários</a></li>
-            </ul>
+<div class="row col-xs-12 panel panel-default busca-page">
 
-            <!-- Tab panes -->
-            <div class="tab-content">
-                <div role="tabpanel" class="tab-pane fade in active" id="user">
-                    <div class="jumbotron formulario">
-                        <?php get_template_part("partes-templates/header_search_users"); ?>
-                    </div>
-                    <div class="row resultado">
+    <!-- Nav tabs -->
+    <ul class="nav nav-tabs" role="tablist">
+        <li role="presentation"><a href="<?php echo RHSSearch::get_search_url(); ?>">Posts</a></li>
+        <li role="presentation" class="active"><a href="#user" aria-controls="user" role="tab" data-toggle="tab">Usuários</a></li>
+    </ul>
 
-                        <?php include_once ("partes-templates/search_common.php"); ?>
+    <!-- Tab panes -->
+    <div class="tab-content">
+        <div role="tabpanel" class="tab-pane fade in active" id="user">
+            <div class="jumbotron formulario">
+                <?php get_template_part("partes-templates/header_search_users"); ?>
+            </div>
+            <div class="row resultado">
 
-                        <div class="membros">
-                            <?php if (!empty($users->results)): ?>
-                                <?php foreach ($users->results as $user): ?>
-                                    <div class="col-md-4 col-xs-12 well-disp" data-userid="<?php echo $user->ID; ?>" data-id="<?php echo $user->ID; ?>">
-                                        <div class="well profile_view">
-                                            <div class="left">
-                                                <span class="membros-avatar">
-                                                    <a href="<?php echo get_author_posts_url($user->ID); ?>" class="membros">
-                                                        <?php echo get_avatar($user->ID); ?>
-                                                    </a>
-                                                </span>
-                                            </div>
-                                            <div class="right">
-                                                <h1>
-                                                    <a href="<?php echo get_author_posts_url($user->ID); ?>" class="membros">
-                                                        <span class="membros-name"><?php echo $user->display_name; ?></span>
-                                                    </a>
-                                                </h1>
-                                                <?php if(has_user_ufmun($user->ID)) { ?>
-                                                    <div class="info-membros">
-                                                        <p class="location">
-                                                            <strong>Localidade: </strong> 
-                                                            <span class="membros-location">
-                                                                <?php echo the_user_ufmun($user->ID); ?>
-                                                            </span>
-                                                        </p>
-                                                    </div>
-                                                <?php } ?>
+                <?php include_once ("partes-templates/search_common.php"); ?>
+
+                <div class="membros">
+                    <?php if (!empty($users->results)): ?>
+                        <?php foreach ($users->results as $user): ?>
+                            <div class="col-md-4 col-xs-12 well-disp" data-userid="<?php echo $user->ID; ?>" data-id="<?php echo $user->ID; ?>">
+                                <div class="well profile_view">
+                                    <div class="left">
+                                        <span class="membros-avatar">
+                                            <a href="<?php echo get_author_posts_url($user->ID); ?>" class="membros">
+                                                <?php echo get_avatar($user->ID); ?>
+                                            </a>
+                                        </span>
+                                    </div>
+                                    <div class="right">
+                                        <h1>
+                                            <a href="<?php echo get_author_posts_url($user->ID); ?>" class="membros">
+                                                <span class="membros-name"><?php echo $user->display_name; ?></span>
+                                            </a>
+                                        </h1>
+                                        <?php if(has_user_ufmun($user->ID)) { ?>
+                                            <div class="info-membros">
+                                                <p class="location">
+                                                    <strong>Localidade: </strong>
+                                                    <span class="membros-location">
+                                                        <?php echo the_user_ufmun($user->ID); ?>
+                                                    </span>
+                                                </p>
                                             </div>
-                                            <div class="clearfix"></div>
-                                        </div>
+                                        <?php } ?>
                                     </div>
-                                <?php endforeach; ?>
-                                <div class="col-xs-12 text-center">
-                                    <?php $RHSSearch->show_users_pagination($users); ?>
+                                    <div class="clearfix"></div>
                                 </div>
-                            <?php else : ?>
-                                <h3 class="text-center"><?php echo __('Nenhum usuário encontrado, tente outro nome.'); ?></h3>
-                            <?php endif; ?>
+                            </div>
+                        <?php endforeach; ?>
+                        <div class="col-xs-12 text-center">
+                            <?php $RHSSearch->show_users_pagination($users); ?>
                         </div>
-                    </div>
+                    <?php else : ?>
+                        <h3 class="text-center"><?php echo __('Nenhum usuário encontrado, tente outro nome.'); ?></h3>
+                    <?php endif; ?>
                 </div>
             </div>
         </div>
     </div>
+
 </div>
 
 <?php get_template_part('partes-templates/export-modal'); ?>
diff --git a/public/wp-content/themes/rhs/search.php b/public/wp-content/themes/rhs/search.php
index efe9724f..f773bb84 100644
--- a/public/wp-content/themes/rhs/search.php
+++ b/public/wp-content/themes/rhs/search.php
@@ -1,31 +1,25 @@
 <?php get_header('full'); ?>
 
-<div class="row">
-    <div class="col-xs-12">
-        <div class="panel panel-default busca-page">
-            <!-- Nav tabs -->
-            <ul class="nav nav-tabs" role="tablist">
-                <li role="presentation" class="active"><a href="#posts" aria-controls="posts" role="tab" data-toggle="tab">Posts</a></li>
-                <li role="presentation"><a href="<?php echo RHSSearch::get_users_search_url(); ?>">Usuários</a></li>
-            </ul>
-
-            <!-- Tab panes -->
-            <div class="tab-content">
-                <div role="tabpanel" class="tab-pane fade in active" id="posts">
-                    <div class="jumbotron formulario">
-                        <?php get_template_part("partes-templates/header_search_post"); ?>
-                    </div>
-                    
-                    <div class="row resultado">
-                        <?php include_once ("partes-templates/search_common.php"); ?>
-                    </div>
-
-                    <?php get_template_part( 'partes-templates/loop-posts'); ?>
-                </div>
-
-                </div>
+<div class="row col-xs-12 panel panel-default busca-page">
+
+    <ul class="nav nav-tabs" role="tablist">
+        <li role="presentation" class="active"><a href="#posts" aria-controls="posts" role="tab" data-toggle="tab">Posts</a></li>
+        <li role="presentation"><a href="<?php echo RHSSearch::get_users_search_url(); ?>">Usuários</a></li>
+    </ul>
+
+    <div class="tab-content">
+        <div role="tabpanel" class="tab-pane fade in active" id="posts">
+            <div class="jumbotron formulario">
+                <?php get_template_part("partes-templates/header_search_post"); ?>
+            </div>
+
+            <div class="row resultado">
+                <?php include_once ("partes-templates/search_common.php"); ?>
             </div>
+
+            <?php get_template_part( 'partes-templates/loop-posts'); ?>
         </div>
+
     </div>
 </div>
 

From 54e0c0c76753edfa7cfa5942f31f36723ab50987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Fri, 15 Jun 2018 02:06:17 -0300
Subject: [PATCH 16/27] =?UTF-8?q?Sugest=C3=A3o=20de=20melhoria=20pra=20apr?=
 =?UTF-8?q?oveitar=20melhor=20espa=C3=A7amento=20da=20pagina=20de=20cadast?=
 =?UTF-8?q?ro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../themes/rhs/assets/scss/_variavels.scss    |  6 +--
 public/wp-content/themes/rhs/registrar.php    | 44 +++++++++----------
 public/wp-content/themes/rhs/search-users.php |  2 +-
 public/wp-content/themes/rhs/search.php       |  2 +-
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/public/wp-content/themes/rhs/assets/scss/_variavels.scss b/public/wp-content/themes/rhs/assets/scss/_variavels.scss
index b16508c2..6623c026 100644
--- a/public/wp-content/themes/rhs/assets/scss/_variavels.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_variavels.scss
@@ -100,6 +100,6 @@ $seguir_mensagem_mobile: inline-grid;
     }
 }
 
-.no-padding {
-    padding: 0 !important;
-}
\ No newline at end of file
+.no-padding { padding: 0 !important; }
+.no-padding-left { padding-left: 0 !important; }
+.no-padding-right { padding-right: 0 !important; }
\ No newline at end of file
diff --git a/public/wp-content/themes/rhs/registrar.php b/public/wp-content/themes/rhs/registrar.php
index 30c8b3cb..ff4953e4 100644
--- a/public/wp-content/themes/rhs/registrar.php
+++ b/public/wp-content/themes/rhs/registrar.php
@@ -24,34 +24,34 @@
                                             </div>
                                         <?php } ?>
                                         <fieldset class="scheduler-border">
-                                            <legend class="scheduler-border">Dados do Login</legend>
+                                            <legend class="scheduler-border">Dados de Login</legend>
 
-                                            <div class="form-group float-label-control">
-                                                <label for="mail" class="col-sm-1 control-label">E-mail <span class="required">*</span></label>
-                                                <div class="col-sm-7">
+                                            <div class="col-md-6 form-group float-label-control no-padding-left">
+                                                <label for="mail" class="control-label">E-mail <span class="required">*</span></label>
+                                                <div class="col-sm-12 no-padding">
                                                     <input class="form-control form-text" type="email" id="mail" name="mail" maxlength="254">
                                                     <input type="hidden" name="register_user_wp" value="<?php echo $RHSRegister->getKey(); ?>">
                                                 </div>
                                                 <div class="col-md-5"> <div class="help-block text-center"></div> </div>
                                             </div>
 
-                                            <div class="form-group float-label-control">
-                                                <label for="mail_confirm" class="col-sm-1 control-label"> <?php echo $_confirm_email; ?> <span class="required">*</span></label>
-                                                <div class="col-sm-7">
+                                            <div class="col-md-6 form-group float-label-control no-padding-right">
+                                                <label for="mail_confirm" class="control-label"> <?php echo $_confirm_email; ?> <span class="required">*</span></label>
+                                                <div class="col-sm-12 no-padding">
                                                     <input class="form-control form-text" type="email" id="mail_confirm" name="mail_confirm" maxlength="254">
                                                 </div>
                                                 <div class="col-md-5"> <div class="help-block text-center"></div> </div>
                                             </div>
 
-                                            <div class="form-group float-label-control" id="confirm_email">
+                                            <div class="col-md-6 form-group float-label-control" id="confirm_email">
                                                 <label for="confirm_mail" class="col-sm-1 control-label"> <?php echo $_confirm_email; ?> <span class="required">*</span></label>
-                                                <div class="col-sm-7">
+                                                <div class="col-sm-12">
                                                     <input class="form-control form-text" id="confirm_mail" name="confirm_mail" maxlength="254">
                                                 </div>
                                             </div>
 
                                             <?php if( rand(0,2) == 0 ): ?>
-                                                <div class="form-group float-label-control" id="u_login">
+                                                <div class="form-group float-label-control no-padding" id="u_login">
                                                     <label for="user_login" class="col-sm-1 control-label">Login <span class="required">*</span></label>
                                                     <div class="col-sm-7">
                                                         <input class="form-control form-text" type="text" id="user_login" name="user_login" maxlength="254">
@@ -59,9 +59,9 @@
                                                 </div>
                                             <?php endif; ?>
 
-                                            <div class="form-group float-label-control">
-                                                    <label for="pass" class="col-sm-1 control-label">Senha <span class="required">*</span></label>
-                                                    <div class="col-sm-7">
+                                            <div class="col-md-6 form-group float-label-control no-padding-left">
+                                                    <label for="pass" class="no-padding control-label">Senha <span class="required">*</span></label>
+                                                    <div class="col-sm-12 no-padding">
                                                         <input class="form-control form-text" type="password" id="pass" name="pass" maxlength="50">
                                                         <label title="Exibir senha" class="show_pass">
                                                             <i class="fa fa-eye-slash"></i>
@@ -72,18 +72,16 @@
                                                     </div>
                                             </div>
 
-                                                <div class="form-group float-label-control">
-                                                    <label for="pass" class="col-sm-1 control-label">Confirme a Senha <span class="required">*</span></label>
-                                                    <div class="col-sm-7">
-                                                        <input class="form-control form-text" type="password" id="pass2" name="pass2" maxlength="50">
-                                                        <label title="Exibir senha" class="show_pass">
-                                                            <i class="fa fa-eye-slash"></i>
-                                                        </label>
-                                                    </div>
-                                                    <div class="col-md-5">
-                                                        <div class="help-block text-center"></div>
+                                            <div class="col-md-6 form-group float-label-control no-padding-right">
+                                                <label for="pass" class="control-label">Confirme a Senha <span class="required">*</span></label>
+                                                <div class="col-sm-12 no-padding">
+                                                    <input class="form-control form-text" type="password" id="pass2" name="pass2" maxlength="50">
+                                                    <label title="Exibir senha" class="show_pass"> <i class="fa fa-eye-slash"></i> </label>
                                                     </div>
+                                                <div class="col-md-5">
+                                                    <div class="help-block text-center"></div>
                                                 </div>
+                                            </div>
                                         </fieldset>
 
                                         <fieldset class="scheduler-border">
diff --git a/public/wp-content/themes/rhs/search-users.php b/public/wp-content/themes/rhs/search-users.php
index 5597951b..ff86d545 100644
--- a/public/wp-content/themes/rhs/search-users.php
+++ b/public/wp-content/themes/rhs/search-users.php
@@ -4,7 +4,7 @@
 // Resultado da busca
 $users = $RHSSearch->search_users();
 ?>
-<div class="row col-xs-12 panel panel-default busca-page">
+<div class="col-xs-12 panel panel-default busca-page">
 
     <!-- Nav tabs -->
     <ul class="nav nav-tabs" role="tablist">
diff --git a/public/wp-content/themes/rhs/search.php b/public/wp-content/themes/rhs/search.php
index f773bb84..a9715bf7 100644
--- a/public/wp-content/themes/rhs/search.php
+++ b/public/wp-content/themes/rhs/search.php
@@ -1,6 +1,6 @@
 <?php get_header('full'); ?>
 
-<div class="row col-xs-12 panel panel-default busca-page">
+<div class="col-xs-12 panel panel-default busca-page">
 
     <ul class="nav nav-tabs" role="tablist">
         <li role="presentation" class="active"><a href="#posts" aria-controls="posts" role="tab" data-toggle="tab">Posts</a></li>

From 146a4f0ddb195f93e6906e5e62d5ea7cafb43678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Fri, 15 Jun 2018 02:23:22 -0300
Subject: [PATCH 17/27] =?UTF-8?q?Fix=20ordena=C3=A7=C3=A3o=20por=20ultimo?=
 =?UTF-8?q?=20login=20(ref=20#275)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../themes/rhs/inc/search/search.php          | 61 ++++++++++---------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/public/wp-content/themes/rhs/inc/search/search.php b/public/wp-content/themes/rhs/inc/search/search.php
index 73f9bf6b..d17811d9 100644
--- a/public/wp-content/themes/rhs/inc/search/search.php
+++ b/public/wp-content/themes/rhs/inc/search/search.php
@@ -319,10 +319,13 @@ static public function get_param($param) {
      * @return Object WP_User_Query 
      */
     public function search_users($params = array()) {
-        
         $users_per_page = self::USERS_PER_PAGE;
         $meta_query = [];
         $has_meta_query = false;
+
+       if (empty($_GET))
+           $is_index = true;
+
         
         $_filters = array_merge([
             'uf' => $this->get_param('uf'),
@@ -371,33 +374,35 @@ public function search_users($params = array()) {
         
         $q_has_publish_posts = false;
 
-        switch ($rhs_order) {
-            case 'name':
-                $q_order = 'ASC';
-                $q_order_by = 'display_name';
-                break;
-            
-            case 'register_date':
-                $q_order = 'DESC';
-                $q_order_by = 'registered';
-                break;
-            
-            case 'posts':
-                $q_order = 'DESC';
-                $q_order_by = 'post_count';
-                $q_has_publish_posts = true;
-                break;
-                
-            case 'votes':
-                $q_order_meta = RHSVote::META_TOTAL_VOTES;
-                break;
-
-            case 'last_login':
-            default:
-                $q_order_meta = RHSLogin::META_KEY_LAST_LOGIN;
-                $q_order      = 'DESC';
-                $q_order_by   = 'meta_value';
-                break;
+        if (isset($is_index) && $is_index) {
+            $q_order_meta = RHSLogin::META_KEY_LAST_LOGIN;
+            $q_order      = 'DESC';
+            $q_order_by   = 'meta_value';
+        } else {
+            switch ($rhs_order) {
+                case 'register_date':
+                    $q_order = 'DESC';
+                    $q_order_by = 'registered';
+                    break;
+                case 'posts':
+                    $q_order = 'DESC';
+                    $q_order_by = 'post_count';
+                    $q_has_publish_posts = true;
+                    break;
+                case 'votes':
+                    $q_order_meta = RHSVote::META_TOTAL_VOTES;
+                    break;
+                case 'last_login':
+                    $q_order_meta = RHSLogin::META_KEY_LAST_LOGIN;
+                    $q_order      = 'DESC';
+                    $q_order_by   = 'meta_value';
+                    break;
+                case 'name':
+                default:
+                    $q_order = 'ASC';
+                    $q_order_by = 'display_name';
+                    break;
+            }
         }
 
         if (!empty($q_order_meta)) {

From e61531e422928300cb19f9a7d0124e89ab2ffc2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Fri, 15 Jun 2018 13:42:36 -0300
Subject: [PATCH 18/27] =?UTF-8?q?Evita=20exibir=20apenas=20','=20para=20us?=
 =?UTF-8?q?u=C3=A1rios=20sem=20UF=20cadastrado=20(user=20profile=20page)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../themes/rhs/inc/uf-municipio/uf-municipio.php    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/public/wp-content/themes/rhs/inc/uf-municipio/uf-municipio.php b/public/wp-content/themes/rhs/inc/uf-municipio/uf-municipio.php
index 911456ee..ca944ab0 100644
--- a/public/wp-content/themes/rhs/inc/uf-municipio/uf-municipio.php
+++ b/public/wp-content/themes/rhs/inc/uf-municipio/uf-municipio.php
@@ -394,26 +394,25 @@ static function the_user($user_id) {
         static $mun_html, $uf_html, $uf_link;
 
         if ($meta['uf']['id']) {
-
             $uf_link = self::get_uf_link($meta['uf']['id'], 'user', $meta['uf']);
             $uf_html = "<a href='$uf_link'>".$meta['uf']['sigla']."</a>";
 
             //$uf_html = $meta['uf']['sigla']; // REMOVER ESSA LINHA QUANDO FIZERMOS OS LINKS FUNCIONAREM
-
         }
 
         if ($meta['mun']['id']) {
-
             $mun_link = self::get_mun_link($meta['mun']['id'], 'user', $meta['mun']);
             $mun_html = "<a href='$mun_link'>".$meta['mun']['nome']."</a>";
 
             //$mun_html = $meta['mun']['nome']; // REMOVER ESSA LINHA QUANDO FIZERMOS OS LINKS FUNCIONAREM
-
         }
 
-        echo $mun_html;
-        echo ', ';
-        echo $uf_html;
+        if (isset($mun_html)) {
+            echo $mun_html;
+        }
+        if (isset($uf_html)) {
+            echo ", " . $uf_html;
+        }
 
     }
 

From 67e5125723e2e0116e8dd578638261edf50f6923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Fri, 15 Jun 2018 14:57:45 -0300
Subject: [PATCH 19/27] =?UTF-8?q?Finaliza=20sugest=C3=A3o=20de=20melhoria?=
 =?UTF-8?q?=20para=20p=C3=A1gina=20de=20cadastro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rhs/assets/js/valida-form-registro.js     |  6 +-
 .../themes/rhs/assets/scss/_login-panel.scss  |  7 ++
 public/wp-content/themes/rhs/registrar.php    | 81 +++++++++----------
 3 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/public/wp-content/themes/rhs/assets/js/valida-form-registro.js b/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
index ae629775..867726e7 100644
--- a/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
+++ b/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
@@ -62,7 +62,7 @@ jQuery( function( $ ) {
                     check_email_exist: "E-mail já existente, escolha outro."
                 },
                 mail_confirm: {
-                    required: "Favor confirmar seu e-mail!",
+                    required: "Favor confirmar seu e-mail.",
                     email: valid_mail_msg,
                     equalTo: "Atenção: A confirmação do e-mail não corresponde ao e-mail informado"
                 },
@@ -84,10 +84,10 @@ jQuery( function( $ ) {
                     required: "Preencha com o seu estado."
                 },
                 municipio: {
-                    required: "Preencha com o seu municipio."
+                    required: "Preencha com o seu município."
                 },
                 hiddenRecaptcha: {
-                    required: "Valide o Captcha primeiro."
+                    required: "Valide o captcha primeiro."
                 }
             },
             invalidHandler: function (event, validator) {},
diff --git a/public/wp-content/themes/rhs/assets/scss/_login-panel.scss b/public/wp-content/themes/rhs/assets/scss/_login-panel.scss
index 7769a536..73b69e5a 100644
--- a/public/wp-content/themes/rhs/assets/scss/_login-panel.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_login-panel.scss
@@ -16,6 +16,13 @@
                     display: none;
                 }
 
+                .form-group {
+                    .block-error {
+                        padding-top: 8px;
+                        font-size: 14px;
+                    }
+                }
+
                 #u_login, #confirm_email, #phone {
                     position: absolute;
                     left: -999em;
diff --git a/public/wp-content/themes/rhs/registrar.php b/public/wp-content/themes/rhs/registrar.php
index ff4953e4..188af64a 100644
--- a/public/wp-content/themes/rhs/registrar.php
+++ b/public/wp-content/themes/rhs/registrar.php
@@ -1,7 +1,7 @@
 <?php get_header('full');
 global $RHSRegister;
 global $RHSCaptcha;
-$_confirm_email = "Confirmar E-mail";
+$_confirm_email = "Confirme seu e-mail";
 ?>
     <div class="row">
         <!-- Container -->
@@ -24,7 +24,7 @@
                                             </div>
                                         <?php } ?>
                                         <fieldset class="scheduler-border">
-                                            <legend class="scheduler-border">Dados de Login</legend>
+                                            <legend> Dados de Login </legend>
 
                                             <div class="col-md-6 form-group float-label-control no-padding-left">
                                                 <label for="mail" class="control-label">E-mail <span class="required">*</span></label>
@@ -73,11 +73,11 @@
                                             </div>
 
                                             <div class="col-md-6 form-group float-label-control no-padding-right">
-                                                <label for="pass" class="control-label">Confirme a Senha <span class="required">*</span></label>
+                                                <label for="pass" class="no-padding control-label">Confirme sua senha <span class="required">*</span></label>
                                                 <div class="col-sm-12 no-padding">
                                                     <input class="form-control form-text" type="password" id="pass2" name="pass2" maxlength="50">
                                                     <label title="Exibir senha" class="show_pass"> <i class="fa fa-eye-slash"></i> </label>
-                                                    </div>
+                                                </div>
                                                 <div class="col-md-5">
                                                     <div class="help-block text-center"></div>
                                                 </div>
@@ -85,10 +85,10 @@
                                         </fieldset>
 
                                         <fieldset class="scheduler-border">
-                                            <legend class="scheduler-border">Dados Pessoais</legend>
-                                            <div class="form-group float-label-control">
-                                                <label for="first_name" class="col-sm-4 control-label">Primeiro Nome <span class="required">*</span></label>
-                                                <div class="col-sm-7">
+                                            <legend> Dados Pessoais </legend>
+                                            <div class="col-md-6 form-group float-label-control no-padding-left">
+                                                <label for="first_name" class="no-padding control-label">Primeiro Nome <span class="required">*</span></label>
+                                                <div class="">
                                                     <input class="form-control form-text" type="text" id="first_name" name="first_name" size="30" maxlength="30">
                                                 </div>
                                                 <div class="col-md-5">
@@ -96,19 +96,18 @@
                                                 </div>
                                             </div>
 
-                                            <?php if( rand(5,7) == 6 ): ?>
+                                            <?php if (rand(5,7) == 6): ?>
                                                 <div class="form-group float-label-control" id="phone">
-                                                    <label for="phone"  class="col-sm-4 control-label">Telefone</label>
+                                                    <label for="phone" class="col-sm-4 control-label">Telefone</label>
                                                     <div class="col-sm-7">
                                                         <input class="form-control form-text" type="text" id="phone" name="phone" value="">
                                                     </div>
                                                 </div>
                                             <?php endif; ?>
 
-                                            <div class="form-group float-label-control">
-                                                <label for="last_name" class="col-sm-4 control-label">Segundo
-                                                    Nome <span class="required">*</span></label>
-                                                <div class="col-sm-7">
+                                            <div class="col-md-6 form-group float-label-control">
+                                                <label for="last_name" class="no-padding control-label"> Segundo Nome <span class="required">*</span> </label>
+                                                <div>
                                                     <input class="form-control form-text" type="text" id="last_name" name="last_name" size="30" maxlength="30">
                                                 </div>
                                                 <div class="col-md-5">
@@ -116,37 +115,33 @@
                                                 </div>
                                             </div>
 
-                                            <div class="form-group float-label-control">
-                                                <label for="description" class="col-sm-5 control-label">Sobre mim
-                                                        <small class="form-text text-muted">(opcional)</small>
-                                                    </label>
-                                                    <div class="col-sm-7">
-                                                        <textarea class="form-control form-textarea" id="description" name="description" cols="60" rows="5"></textarea>
-                                                    </div>
-                                                    <div class="col-md-5">
-                                                        <div class="help-block text-center"></div>
-                                                    </div>
-                                            </div>
-                                                <div class="form-group float-label-control">
-                                                    <div class="row">
-                                                        <div class="col-sm-7">
-                                                        <?php UFMunicipio::form( array(
-                                                            'content_before' => '<div class="row">',
-                                                            'content_after' => '</div>',
-                                                            'content_before_field' => '<div class="col-md-6"><div class="form-group float-label-control">',
-                                                            'content_after_field' => '<div class="clearfix"></div></div></div>',
-                                                            'state_label'  => 'Estado <span class="required">*</span>&nbsp',
-                                                            'city_label'   => 'Cidade <span class="required">*</span>&nbsp',
-                                                            'select_class' => 'form-control',
-                                                            'label_class'  => 'control-label col-sm-4'
-                                                        ) ); ?>
-                                                        </div>
-                                                        <div class="col-md-5">
-                                                            <div class="help-block text-center"></div>
-                                                        </div>
-                                                    </div>
+                                            <div class="col-md-6 form-group float-label-control no-padding-left">
+                                                <label for="description" class="control-label"> Sobre mim <small>(opcional)</small> </label>
+                                                <textarea class="form-control form-textarea" id="description" name="description" cols="60" rows="5"></textarea>
+
+                                                <div class="col-md-5">
+                                                    <div class="help-block text-center"></div>
                                                 </div>
+                                            </div>
+
+                                            <div class="col-md-6 form-group float-label-control no-padding-right">
+                                                <?php UFMunicipio::form( array(
+                                                    'content_before' => '<div class="no-padding">',
+                                                    'content_after' => '</div>',
+                                                    'select_before' => '',
+                                                    'content_before_field' => '<div class="form-group float-label-control">',
+                                                    'content_after_field' => '</div>',
+                                                    'state_label'  => 'Estado <span class="required">*</span>&nbsp',
+                                                    'city_label'   => 'Cidade <span class="required">*</span>&nbsp',
+                                                    'select_class' => 'form-control',
+                                                    'label_class'  => 'control-label'
+                                                )); ?>
+
+                                                <div class="col-md-12"> <div class="help-block text-center"></div> </div>
+                                            </div>
+
                                         </fieldset>
+
                                         <fieldset class="scheduler-border">
                                             <legend class="scheduler-border">Captcha</legend>
                                             <div class="form-group float-label-control capt">

From 37aea65fc654bc6aaca8f3a5d511aa041517b1cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Fri, 15 Jun 2018 15:20:58 -0300
Subject: [PATCH 20/27] =?UTF-8?q?=C3=BAltimas=20adapta=C3=A7=C3=B5es=20pag?=
 =?UTF-8?q?ina=20de=20cadastro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/wp-content/themes/rhs/inc/captcha/captcha.php |  2 +-
 public/wp-content/themes/rhs/registrar.php           | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/wp-content/themes/rhs/inc/captcha/captcha.php b/public/wp-content/themes/rhs/inc/captcha/captcha.php
index 07cb71fd..089f3729 100644
--- a/public/wp-content/themes/rhs/inc/captcha/captcha.php
+++ b/public/wp-content/themes/rhs/inc/captcha/captcha.php
@@ -78,7 +78,7 @@ function display_captcha_secret_key_element() { ?>
 
     function display_recuperar_captcha() { 
         ?>
-        <div class="g-recaptcha" data-sitekey="<?php echo get_option( self::SITE_KEY ); ?>"  data-callback="recaptchaCallback"></div>
+        <div class="g-recaptcha col-xs-12 col-md-12 col-sm-12" data-sitekey="<?php echo get_option( self::SITE_KEY ); ?>" data-callback="recaptchaCallback"></div>
         <input type="hidden" class="hiddenRecaptcha required" name="hiddenRecaptcha" id="hiddenRecaptcha">
     <?php }
 
diff --git a/public/wp-content/themes/rhs/registrar.php b/public/wp-content/themes/rhs/registrar.php
index 188af64a..631d7d5a 100644
--- a/public/wp-content/themes/rhs/registrar.php
+++ b/public/wp-content/themes/rhs/registrar.php
@@ -143,11 +143,11 @@
                                         </fieldset>
 
                                         <fieldset class="scheduler-border">
-                                            <legend class="scheduler-border">Captcha</legend>
-                                            <div class="form-group float-label-control capt">
-                                                <div class="col-xs-12 col-sm-7">
-                                                    <?php $RHSCaptcha->display_recuperar_captcha(); ?>
-                                                </div>
+                                            <legend class="scheduler-border">Valide o captcha</legend>
+                                            <div class="form-group float-label-control capt col-md-12">
+
+                                                <?php $RHSCaptcha->display_recuperar_captcha(); ?>
+
                                                 <div class="col-xs-12 col-md-5">
                                                     <div class="help-block text-center"></div>
                                                 </div>

From 5810b3409cfcff246e03ca1b417fb4f91d94f505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Fri, 15 Jun 2018 18:15:41 -0300
Subject: [PATCH 21/27] Melhora termos do cadastro

---
 public/wp-content/themes/rhs/registrar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/wp-content/themes/rhs/registrar.php b/public/wp-content/themes/rhs/registrar.php
index 631d7d5a..93f17f43 100644
--- a/public/wp-content/themes/rhs/registrar.php
+++ b/public/wp-content/themes/rhs/registrar.php
@@ -87,7 +87,7 @@
                                         <fieldset class="scheduler-border">
                                             <legend> Dados Pessoais </legend>
                                             <div class="col-md-6 form-group float-label-control no-padding-left">
-                                                <label for="first_name" class="no-padding control-label">Primeiro Nome <span class="required">*</span></label>
+                                                <label for="first_name" class="no-padding control-label"> Nome <span class="required">*</span></label>
                                                 <div class="">
                                                     <input class="form-control form-text" type="text" id="first_name" name="first_name" size="30" maxlength="30">
                                                 </div>
@@ -106,7 +106,7 @@
                                             <?php endif; ?>
 
                                             <div class="col-md-6 form-group float-label-control">
-                                                <label for="last_name" class="no-padding control-label"> Segundo Nome <span class="required">*</span> </label>
+                                                <label for="last_name" class="no-padding control-label"> Sobrenome <span class="required">*</span> </label>
                                                 <div>
                                                     <input class="form-control form-text" type="text" id="last_name" name="last_name" size="30" maxlength="30">
                                                 </div>

From aa746e0e744f57d468415146b9fdd6d5f4b89b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimar=C3=A3es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 16 Jun 2018 17:59:42 -0300
Subject: [PATCH 22/27] Fix busca de posts por termo completo

---
 .../themes/rhs/inc/search/search.php          | 40 +++++++++++++++----
 .../partes-templates/header_search_post.php   | 40 +++++++++----------
 2 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/public/wp-content/themes/rhs/inc/search/search.php b/public/wp-content/themes/rhs/inc/search/search.php
index d17811d9..fdcbf434 100644
--- a/public/wp-content/themes/rhs/inc/search/search.php
+++ b/public/wp-content/themes/rhs/inc/search/search.php
@@ -115,10 +115,6 @@ function pre_get_posts(&$wp_query) {
                 $wp_query->set('s', $keyword);
             }
 
-            if( $full_term == "true" ) {
-                $wp_query->set('exact', true);
-            }
-
             // DATAS
             if (!empty($date_from) || !empty($date_to)) {
                 $date_query = [];
@@ -138,7 +134,6 @@ function pre_get_posts(&$wp_query) {
                     $date_query['inclusive'] = true;
                     $wp_query->set('date_query', [$date_query]);
                 }
-
             }
 
             $meta_query = [];
@@ -157,8 +152,7 @@ function pre_get_posts(&$wp_query) {
                         ];
                         $has_meta_query = true;
                     }
-
-
+                    
                 }
 
                 if (!empty($uf) && !isset($meta_query['municipio']) /* se já tem municipio não precisa filtrar por estado tb */ ) {
@@ -175,7 +169,6 @@ function pre_get_posts(&$wp_query) {
                     }
 
                 }
-
             }
 
             // ORDER
@@ -218,6 +211,10 @@ function pre_get_posts(&$wp_query) {
                 $meta_query['relation'] = 'AND';
                 $wp_query->set('meta_query', [$meta_query]);
             }
+            
+            if( $full_term == "true" ) {
+                add_action('posts_search', array(&$this,'busca_termo_completo'), 20, 2);
+            }
 
             $wp_query->set('order', $q_order);
             $wp_query->set('orderby', $q_order_by);
@@ -226,6 +223,33 @@ function pre_get_posts(&$wp_query) {
         }
 
     }
+
+    function busca_termo_completo( $busca, $wp_query ) {
+        if (empty($busca))
+            return $busca;
+        
+        global $wpdb;
+        $params = $wp_query->query_vars;
+        $termos_busca = (array) $params['search_terms'];
+
+        $busca = $searchand = '';
+        if (is_array($termos_busca) && count($termos_busca) > 0 ) {
+            foreach ($termos_busca as $term ) {
+                $term = esc_sql($wpdb->esc_like($term));
+                $busca .= "{$searchand}($wpdb->posts.post_title REGEXP '[[:<:]]{$term}[[:>:]]') OR ($wpdb->posts.post_content REGEXP '[[:<:]]{$term}[[:>:]]')";
+
+                $searchand = ' AND ';
+            }
+
+            if (!empty($busca)) {
+                $busca = " AND ({$busca}) ";
+                if ( ! is_user_logged_in() )
+                    $busca .= " AND ($wpdb->posts.post_password = '') ";
+            }
+        }
+
+        return $busca;
+    }
     
     /**
      * Faz parse de uma string de data no formato YYYY-MM-DD e retorna 
diff --git a/public/wp-content/themes/rhs/partes-templates/header_search_post.php b/public/wp-content/themes/rhs/partes-templates/header_search_post.php
index f78a2066..d98c828b 100644
--- a/public/wp-content/themes/rhs/partes-templates/header_search_post.php
+++ b/public/wp-content/themes/rhs/partes-templates/header_search_post.php
@@ -27,34 +27,34 @@
 
         </div>
 
-            <div class="col-md-6">
-                <div class="col-md-12">
-                    <label for="date" class="control-label">Data</label>
-                    <div class="form-group date-range-container">
-                        <div class="input-group input-daterange" style="width: 100%">
-                            <div class="input-group-addon">a partir de</div>
-                            <input type="text" class="form-control" value="<?php echo RHSSearch::get_param('date_from'); ?>" name="date_from">
-                            <div class="input-group-addon">até</div>
-                            <input type="text" class="form-control" value="<?php echo RHSSearch::get_param('date_to'); ?>" name="date_to">
-                        </div>
+        <div class="col-md-6">
+            <div class="col-md-12">
+                <label for="date" class="control-label">Data</label>
+                <div class="form-group date-range-container">
+                    <div class="input-group input-daterange" style="width: 100%">
+                        <div class="input-group-addon">a partir de</div>
+                        <input type="text" class="form-control" value="<?php echo RHSSearch::get_param('date_from'); ?>" name="date_from">
+                        <div class="input-group-addon">até</div>
+                        <input type="text" class="form-control" value="<?php echo RHSSearch::get_param('date_to'); ?>" name="date_to">
                     </div>
                 </div>
+            </div>
 
-                <div class="col-md-12" style="margin-top: 10px;">
-                    <label for="keyword" class="control-label palavra-chave">Palavra Chave</label>
-                    <div class="keyword-container">
-                        <input type="text" name="keyword" id="keyword" class="form-control" value="<?php echo RHSSearch::get_param('keyword'); ?>">
-                    </div>
-
-                    <div class="form-inline" style="text-align: right">
-                        <label for="full-term" style="font-size: x-small; color: grey"> <?php _e('Buscar termo completo', 'rhs'); ?> </label>
-                        <input type="checkbox" value="true" <?php echo (RHSSearch::get_param('full-term')) ? 'checked' : ''; ?> name="full-term">
-                    </div>
+            <div class="col-md-12" style="margin-top: 10px;">
+                <label for="keyword" class="control-label palavra-chave">Palavra Chave</label>
+                <div class="keyword-container">
+                    <input type="text" name="keyword" id="keyword" class="form-control" value="<?php echo RHSSearch::get_param('keyword'); ?>">
+                </div>
 
+                <div class="form-inline" style="text-align: right">
+                    <label for="full-term" style="font-size: x-small; color: grey"> <?php _e('Buscar termo completo', 'rhs'); ?> </label>
+                    <input type="checkbox" value="true" <?php echo (RHSSearch::get_param('full-term')) ? 'checked' : ''; ?> name="full-term">
                 </div>
 
             </div>
 
+        </div>
+
         <div class="row"> <div class="col-xs-12" id="custom-ctn"></div> </div>
 
         <?php echo RHSSearch::getSearchButtons(); ?>

From 970ffcd55a8cc5acc08ebb2c577cb113bf96455a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimar=C3=A3es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 16 Jun 2018 19:54:40 -0300
Subject: [PATCH 23/27] Corrige resultados da busca por usuarios

---
 public/wp-content/themes/rhs/inc/search/search.php     | 10 +++++++---
 .../themes/rhs/partes-templates/search_common.php      | 10 ++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/public/wp-content/themes/rhs/inc/search/search.php b/public/wp-content/themes/rhs/inc/search/search.php
index fdcbf434..f338377a 100644
--- a/public/wp-content/themes/rhs/inc/search/search.php
+++ b/public/wp-content/themes/rhs/inc/search/search.php
@@ -885,10 +885,14 @@ function exibir_resultado_user(){
 
     $final = $per_page * $paged;
 
-    $initial = $final - ($per_page-1);
-    if ($final > $total) $final = $total;
+    if($total > 0) {
+        $initial = $final - ($per_page - 1);
+        if ($final > $total) $final = $total;
 
-    echo "Exibindo $initial a $final de $total resultados";
+        echo "Exibindo $initial a $final de $total resultados";
+    } else {
+        _e("Nenhum usuário encontrado com estes filtros de busca!", "rhs");
+    }
 }
 
 function return_value_or_zero($value){
diff --git a/public/wp-content/themes/rhs/partes-templates/search_common.php b/public/wp-content/themes/rhs/partes-templates/search_common.php
index a0042ac3..07673fa2 100644
--- a/public/wp-content/themes/rhs/partes-templates/search_common.php
+++ b/public/wp-content/themes/rhs/partes-templates/search_common.php
@@ -4,7 +4,13 @@
 
         <?php if(count($_GET)) { ?>
             <div class="label-rhs">
-                <?php exibir_resultado_post(); //Mostra o resultado da busca dos posts ?>
+            <?php
+            if (isset($users) && $users instanceof WP_User_Query):
+                exibir_resultado_user();
+            else:
+                exibir_resultado_post();
+            endif;
+            ?>
             </div>
         <?php } ?>
 
@@ -16,7 +22,7 @@
             <div class="dropdown">
                 <?php RHSSearch::show_button_download_report(); ?>
 
-                <?php if (isset($users) && $users instanceof WP_User_Query) : ?>
+                <?php if (isset($users) && $users instanceof WP_User_Query): ?>
                     <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                         Ordenar por
                         <?php

From 8753d37926bdfee72447ebde0e1c44c446792ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimar=C3=A3es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 16 Jun 2018 20:35:30 -0300
Subject: [PATCH 24/27] fix config do Travis, que nao estava bem ]adaptado para
 o uso da RHS

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 72c723d2..108f8bc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 sudo: enabled
 language: php
 php:
+- 5.6
 - 7.1
 - hhvm
 - nightly
 matrix:
   allow_failures:
-  - php: 7.1
   - php: hhvm
   - php: nightly
   fast_finish: true
@@ -16,7 +16,6 @@ addons:
 apt:
    packages:
     - sshpass
-#teste deploy
 services:
 - mysql
 before_install:
@@ -45,7 +44,7 @@ deploy:
   script:   sshpass -p '$pass_user_server_prod_rhs'  ssh $user_server_prod_rhs@$host_server_prod_rhs "sh $path_deploy_server_prod_rhs/wp-rhs/deploy.sh"
   skip_cleanup: true
   on:
-    branch: develop
+    branch: master
 cache:
   directories:
   - vendor

From a89c7b1921afb7e28a1e3ce1dcb7b594d3ba544c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimar=C3=A3es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Sat, 16 Jun 2018 20:40:09 -0300
Subject: [PATCH 25/27] Melhor setup do composer para uso em producao

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 108f8bc2..afa90380 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ before_install:
 
 before script: 
 install:
-- composer install
+- composer install --no-dev
 script: "./run-tests.sh"
 after_success:
 - eval "$(ssh-agent -s)"

From 44d15329e3e246156b041fbd185d903509021c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Mon, 18 Jun 2018 17:32:47 -0300
Subject: [PATCH 26/27] =?UTF-8?q?Add=20confirma=C3=A7=C3=A3o=20de=20e-mail?=
 =?UTF-8?q?=20em=20FC=20(ref=20#276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rhs/assets/js/valida-form-registro.js     | 13 +++++++++++-
 .../themes/rhs/assets/scss/_contato-page.scss |  1 +
 public/wp-content/themes/rhs/contato.php      | 21 ++++++++++++-------
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/public/wp-content/themes/rhs/assets/js/valida-form-registro.js b/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
index 867726e7..ae551808 100644
--- a/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
+++ b/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
@@ -507,6 +507,12 @@ jQuery( function( $ ) {
                     email: true,
                     required: true
                 },
+                confirm_email: {
+                    email: true,
+                    required: true,
+                    check_email_exist: true,
+                    equalTo: "input[name='mail']"
+                },
                 category: {
                     required: true
                 },
@@ -536,9 +542,14 @@ jQuery( function( $ ) {
                     required: 'Preencha seu nome.'
                 },
                 email: {
-                    email: 'Formato de e-mail inválido.',
+                    email: valid_mail_msg,
                     required: 'Informe seu e-mail.'
                 },
+                confirm_email: {
+                    required: 'Confirme seu e-mail.',
+                    email: valid_mail_msg,
+                    equalTo: "Atenção: A confirmação do e-mail não corresponde ao e-mail informado"
+                },
                 category: {
                     required: 'Selecione a categoria que melhor se adequa ao seu contato!'
                 },
diff --git a/public/wp-content/themes/rhs/assets/scss/_contato-page.scss b/public/wp-content/themes/rhs/assets/scss/_contato-page.scss
index 5c7e911c..04b0fb71 100644
--- a/public/wp-content/themes/rhs/assets/scss/_contato-page.scss
+++ b/public/wp-content/themes/rhs/assets/scss/_contato-page.scss
@@ -37,6 +37,7 @@
                     }
                     text-align: left;
                 }
+                span.required { color: red; }
             }
             table {
                 thead {
diff --git a/public/wp-content/themes/rhs/contato.php b/public/wp-content/themes/rhs/contato.php
index f8158ff2..112eaaee 100644
--- a/public/wp-content/themes/rhs/contato.php
+++ b/public/wp-content/themes/rhs/contato.php
@@ -8,14 +8,14 @@
 ?>
 <?php get_header(); ?>
 
-            <div class="row">
-                <div class="col-xs-12">
-                    <h1 class="titulo-page">Contato</h1>
-                    <div class="pull-right edit-page">
-                        <?php edit_post_link( __( 'Editar Página', 'rhs' ), '<span class="text-uppercase">', '</span>', null, 'btn btn-default' ); ?>
-                    </div>
-                </div>
+    <div class="row">
+        <div class="col-xs-12">
+            <h1 class="titulo-page">Contato</h1>
+            <div class="pull-right edit-page">
+                <?php edit_post_link( __( 'Editar Página', 'rhs' ), '<span class="text-uppercase">', '</span>', null, 'btn btn-default' ); ?>
             </div>
+        </div>
+    </div>
             <div class="row">
                 <div class="col-xs-12 contato">
                     <div class="wrapper-content">
@@ -69,10 +69,15 @@
                                     <?php endif; ?>
 
                                     <div class="form-group float-label-control" style="display: <?php echo $dis; ?>">
-                                        <label for="email">Email <span class="required">*</span></label>
+                                        <label for="email">E-mail <span class="required">*</span></label>
                                         <input type="email" tabindex="2" name="email" id="input-email" class="form-control" value="<?php echo $RHSUsers->get_user_data('email');?>" >
                                     </div>
 
+                                    <div class="form-group float-label-control" style="display: <?php echo $dis; ?>">
+                                        <label for="confirm_email">Confirme seu e-mail <span class="required">*</span></label>
+                                        <input type="email" tabindex="2" name="confirm_email" id="input-confirm-email" class="form-control" value="<?php echo $RHSUsers->get_user_data('email');?>" >
+                                    </div>
+
                                     <?php if( rand(10,12) == 11 ): ?>
                                         <div id="contact_phone" class="form-group">
                                             <label for="phone">Telefone <span class="required">*</span></label>

From de5f550dc2357a95c5d9be500205b436eb9ba704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Guimara=CC=83es?=
 <rodrigodeoliveira@hotmail.com.br>
Date: Mon, 18 Jun 2018 17:58:22 -0300
Subject: [PATCH 27/27] fix typo (ref #276)

---
 public/wp-content/themes/rhs/assets/js/valida-form-registro.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/wp-content/themes/rhs/assets/js/valida-form-registro.js b/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
index ae551808..a5efbd48 100644
--- a/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
+++ b/public/wp-content/themes/rhs/assets/js/valida-form-registro.js
@@ -511,7 +511,7 @@ jQuery( function( $ ) {
                     email: true,
                     required: true,
                     check_email_exist: true,
-                    equalTo: "input[name='mail']"
+                    equalTo: "input[name='email']"
                 },
                 category: {
                     required: true