Merge branch 'release/v1.2.9'

medialab-ufg · Jun 18, 2018 · 25018d7 · 25018d7
2 parents c7af0d9 + de5f550
commit 25018d7
Show file tree

Hide file tree

Showing 23 changed files with 501 additions and 402 deletions.
diff --git 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:
@@ -30,7 +29,7 @@ before_install:
 
 before script: 
 install:
-- composer install
+- composer install --no-dev
 script: "./run-tests.sh"
 after_success:
 - eval "$(ssh-agent -s)"
@@ -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

diff --git 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/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) {},
@@ -444,7 +444,7 @@ jQuery( function( $ ) {
             },
             messages: {
                 title: {
-                    required: 'Preencha o titulo.'
+                    required: 'Preencha o título.'
                 },
                 'category[]': {
                     required: 'Selecione uma categoria.'
@@ -507,6 +507,12 @@ jQuery( function( $ ) {
                     email: true,
                     required: true
                 },
+                confirm_email: {
+                    email: true,
+                    required: true,
+                    check_email_exist: true,
+                    equalTo: "input[name='email']"
+                },
                 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/_busca-page.scss b/public/wp-content/themes/rhs/assets/scss/_busca-page.scss
@@ -4,6 +4,18 @@
 *
 ************/
 .busca-page {
+    padding: 10px;
+    form {
+        padding-top: 10px !important;
+
+        .uf-city {
+            padding-bottom: 20px;
+        }
+
+        .tags-categories {
+            padding-top: 10px !important;
+        }
+    }
     .nav-tabs{
         li{
             a{
@@ -28,10 +40,12 @@
     #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;
+            float: left;
+            width: 100%;
 
             label { color: $primeira_cor_fundo;  }
 
@@ -45,9 +59,7 @@
                 .col2{
                     text-align: center;
                 }
-                #municipio{
-                    width: 194px !important;
-                }
+                //#municipio{  width: 194px !important;  }
             }
             @media only screen and (width: 1024px) and (height: 1366px){
                 .form-inline{
@@ -93,49 +105,66 @@
                     padding: 0;
                 }
             }
-            .filtro{
+            .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;
                 -o-transition: all 0.3s ease;
                 transition: all 0.3s ease;
             }
         }
-        .resultado{
+        .resultado {
             padding: 15px;
             padding-top: 0;
-            .retorno{
-                background: aliceblue;
+
+            @media only screen and (min-width: 991px) {
+                .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;
-                margin: 0 15px 0 -15px;
+            .classificar {
                 padding: 14px;
+                padding-right: 0;
                 border-top-right-radius: 8px;
             }
         }
     }
-    #user{
+    #posts {
+        .formulario {
+            .filtro {
+                margin-right: 25px;
+                margin-top: 10px;
+            }
+        }
+    }
+    #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; }
        }
     }
+
+    div.membros {
+        float: left;
+        width: 100%;
+    }
 }
 
 #exportModal{

diff --git 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/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/assets/scss/_page.scss b/public/wp-content/themes/rhs/assets/scss/_page.scss
@@ -38,4 +38,38 @@
     }
     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-posts {
+    color: black;
+    background: white;
+    float: left;
+    width: 100%;
+    text-align: center;
+    padding: 20px 0;
+    border-bottom: 1px solid;
 }
diff --git 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/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-padding-left { padding-left: 0 !important; }
+.no-padding-right { padding-right: 0 !important; }
diff --git 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>

diff --git 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/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()}"]);
+        }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ @@
                         }
                         text-align: left;
                     }
+                    span.required { color: red; }
                 }
                 table {
                     thead {
@@ Expand Down @@