Skip to content

Commit

Permalink
Merge branch 'release/0.13'
Browse files Browse the repository at this point in the history
  • Loading branch information
leogermani committed Oct 29, 2019
2 parents 1c8b619 + d39c9d0 commit 7925186
Show file tree
Hide file tree
Showing 197 changed files with 8,563 additions and 5,304 deletions.
15 changes: 0 additions & 15 deletions .travis.yml
Expand Up @@ -45,21 +45,6 @@ install:
- echo 'if ( php -v|grep -q --only-matching --perl-regexp "5\.\\d+\.\\d+" );then /usr/local/bin/phpunit-5 $@;else /usr/local/bin/phpunit-6 $@;fi;exit $?' |sudo tee -a /usr/local/bin/phpunit > /dev/null
- sudo chmod +x /usr/local/bin/phpunit
script: /usr/local/bin/phpunit # phpunit
before_deploy:
- echo "Seção executada antes do deploy!"
- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv
-in deploy_rsa.enc -out /tmp/deploy_rsa -d
- eval "$(ssh-agent -s)"
- chmod 600 /tmp/deploy_rsa
- ssh-add /tmp/deploy_rsa
- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
- ssh-add -l
deploy:
- provider: script
script: sshpass -p '$ssh_password' ssh $ssh_user@$ssh_host sh /home/l3p/atualiza_git/atualiza_todos.sh #MECHI AQUI!! #ssh $ssh_user@$ssh_host $script_deploy_tainacan
skip_cleanup: true
on:
branch: develop
cache:
directories:
- vendor
Expand Down
2 changes: 2 additions & 0 deletions build.sh
Expand Up @@ -72,6 +72,8 @@ rsync -axz --exclude='vendor/bin/phpc*' --exclude='vendor/squizlabs' --exclude='
--exclude='vendor/respect/validation/docs' --exclude='vendor/respect/validation/tests' \
--exclude='pdf-viewer/pdfjs-dist/web/compressed.tracemonkey-pldi-09.pdf' \
--exclude='vendor/tecnickcom/tcpdf/fonts' \
--exclude='vendor/smalot/pdfparser/src/Smalot/PdfParser/Tests/' \
--exclude='vendor/tecnickcom/tcpdf/examples' \
src/* $wp_plugin_dir/

rm -rf $wp_plugin_dir/scss
Expand Down
2 changes: 2 additions & 0 deletions compile-sass.sh
Expand Up @@ -31,5 +31,7 @@ sass -E 'UTF-8' --cache-location .tmp/sass-cache-10 src/gutenberg-blocks/tainaca

sass -E 'UTF-8' --cache-location .tmp/sass-cache-11 src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss:src/assets/css/tainacan-gutenberg-block-facets-list.css

sass -E 'UTF-8' --cache-location .tmp/sass-cache-12 src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss:src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css

echo "Compilação do Sass Concluído!"
exit 0
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"axios": "^0.19.0",
"buefy": "^0.8.3",
"buefy": "^0.8.6",
"bulma": "^0.7.5",
"mdi": "^2.2.43",
"moment": "^2.22.2",
Expand Down
61 changes: 31 additions & 30 deletions src/admin/class-tainacan-admin.php
Expand Up @@ -41,14 +41,14 @@ function add_admin_menu() {
array( &$this, 'admin_page' ),
plugin_dir_url( __FILE__ ) . 'images/tainacan_logo_symbol.svg'
);
add_submenu_page(
$this->menu_slug,
__('System check', 'tainacan'),
__('System check', 'tainacan'),
'manage_options',
'tainacan_systemcheck',
array( &$this, 'systemcheck_page' )

add_submenu_page(
$this->menu_slug,
__('System check', 'tainacan'),
__('System check', 'tainacan'),
'manage_options',
'tainacan_systemcheck',
array( &$this, 'systemcheck_page' )
);

add_action( 'load-' . $page_suffix, array( &$this, 'load_admin_page' ) );
Expand All @@ -57,6 +57,7 @@ function add_admin_menu() {
function load_admin_page() {
add_action( 'admin_enqueue_scripts', array( &$this, 'add_admin_css' ), 90 );
add_action( 'admin_enqueue_scripts', array( &$this, 'add_admin_js' ), 90 );
add_action( 'admin_enqueue_scripts', array(&$this, 'add_theme_files') );
}


Expand All @@ -74,18 +75,18 @@ function load_theme_files() {

function add_theme_files() {
global $TAINACAN_BASE_URL;

// wp_enqueue_style( 'style', $TAINACAN_BASE_URL . '/assets/css/fonts/materialdesignicons.css' );
wp_enqueue_style( 'tainacan-fonts', $TAINACAN_BASE_URL . '/assets/css/fonts/tainacanicons.css', [], TAINACAN_VERSION );
wp_enqueue_style( 'roboto-fonts', 'https://fonts.googleapis.com/css?family=Roboto:400,400i,500,500i,700,700i', [], TAINACAN_VERSION );
wp_enqueue_script('underscore');
}

function add_admin_css() {
global $TAINACAN_BASE_URL;

wp_enqueue_style( 'tainacan-admin-page', $TAINACAN_BASE_URL . '/assets/css/tainacan-admin.css', [], TAINACAN_VERSION );

// $undesired_wp_styles = [
// 'admin-menu',
// 'admin-bar',
Expand Down Expand Up @@ -119,38 +120,38 @@ function add_admin_css() {
//
// wp_dequeue_style( $undesired_wp_styles );
// wp_deregister_style( $undesired_wp_styles );

}

function add_admin_js() {
global $TAINACAN_BASE_URL;

wp_enqueue_script( 'tainacan-user-admin', $TAINACAN_BASE_URL . '/assets/user_admin-components.js', ['underscore', 'media-editor', 'media-views', 'customize-controls'], TAINACAN_VERSION, true );

$settings = $this->get_admin_js_localization_params();

wp_localize_script( 'tainacan-user-admin', 'tainacan_plugin', $settings );
wp_enqueue_media();
wp_enqueue_script('underscore');
wp_enqueue_script('jcrop');
wp_enqueue_script( 'customize-controls' );

do_action('tainacan-enqueue-admin-scripts');

}

/**
* Also used by DevInterface
*/
function get_admin_js_localization_params() {
global $TAINACAN_BASE_URL, $TAINACAN_API_MAX_ITEMS_PER_PAGE;

$Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance();
$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
$Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
$Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
$Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();

$tainacan_admin_i18n = require( 'tainacan-admin-i18n.php' );

$entities_labels = [
Expand Down Expand Up @@ -222,33 +223,33 @@ function get_admin_js_localization_params() {
}

$filter_types = $Tainacan_Filters->fetch_filter_types();

foreach ( $filter_types as $index => $filter_type){
$class = new $filter_type;
$settings['i18n']['helpers_label'][$class->get_component()] = $class->get_form_labels();
}

$settings['form_hooks'] = Admin_Hooks::get_instance()->get_registered_hooks();

$wp_post_types = get_post_types(['show_ui' => true], 'objects');
if (isset($wp_post_types['attachment'])) {
unset($wp_post_types['attachment']);
}

$wp_post_types = array_map(function($i) {
return [
'slug' => $i->name,
'label' => $i->label
];
}, $wp_post_types);

$settings['wp_post_types'] = $wp_post_types;

// add an alternative to enable select all items in all pages while we temporarly disable bulk edit for all (see #199)
$settings['enable_select_all_items_pages'] = defined('TAINACAN_ENABLE_SELECT_ALL_ITEMS_PAGES') ? TAINACAN_ENABLE_SELECT_ALL_ITEMS_PAGES : false;
$settings['enable_select_all_items_pages'] = defined('TAINACAN_ENABLE_SELECT_ALL_ITEMS_PAGES') ? TAINACAN_ENABLE_SELECT_ALL_ITEMS_PAGES : false;

return $settings;

}

function admin_body_class( $classes ) {
Expand Down Expand Up @@ -334,7 +335,7 @@ function ajax_sample_permalink(){

wp_die();
}

public function systemcheck_page() {
require_once('system-check/class-tainacan-system-check.php');
$check = new System_Check();
Expand Down
25 changes: 18 additions & 7 deletions src/admin/components/bulk-edition/bulk-edition-modal.vue
@@ -1,5 +1,12 @@
<template>
<div class="tainacan-modal-content this-tainacan-modal-content">
<div
aria-labelledby="alert-dialog-title"
autofocus
role="alertdialog"
tabindex="-1"
aria-modal
class="tainacan-modal-content this-tainacan-modal-content"
ref="bulkEditionModal">
<header class="tainacan-modal-title">
<h2>{{ modalTitle }}
<small class="tainacan-total-objects-info">
Expand All @@ -17,7 +24,7 @@

<b-select
:loading="metadataIsLoading"
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': !!bulkEditionProcedures[criterion].metadatumID}"
:disabled="!!bulkEditionProcedures[criterion].metadatumID || metadataIsLoading"
class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last"
:placeholder="$i18n.get('instruction_select_a_metadatum')"
Expand All @@ -40,7 +47,7 @@
</b-select>

<b-select
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': !!bulkEditionProcedures[criterion].action }"
v-if="bulkEditionProcedures[criterion] &&
bulkEditionProcedures[criterion].metadatumID"
:disabled="!!bulkEditionProcedures[criterion].action"
Expand Down Expand Up @@ -118,7 +125,7 @@
v-else-if="bulkEditionProcedures[criterion] &&
bulkEditionProcedures[criterion].metadatumID == 'status'">
<b-select
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': bulkEditionProcedures[criterion].isDone}"
:disabled="bulkEditionProcedures[criterion].isDone"
class="tainacan-bulk-edition-field tainacan-bulk-edition-field-last"
:placeholder="$i18n.get('instruction_select_a_status2')"
Expand Down Expand Up @@ -353,6 +360,10 @@
this.groupID = this.getGroupID();
});
},
mounted() {
if (this.$refs.bulkEditionModal)
this.$refs.bulkEditionModal.focus();
},
computed: {
metadata() {
return this.getMetadata();
Expand All @@ -370,10 +381,10 @@
add: this.$i18n.get('add_value'),
redefine: this.$i18n.get('set_new_value'),
remove: this.$i18n.get('remove_value'),
replace: this.$i18n.get('replace_value'),
replace: this.$i18n.get('replace_value')
},
editionActionsForNotMultiple: {
redefine: this.$i18n.get('set_new_value'),
redefine: this.$i18n.get('set_new_value')
},
bulkEditionProcedures: {
1: {
Expand Down Expand Up @@ -432,7 +443,7 @@
let index = this.editionCriteria.indexOf(criterion);
this.dones[index] = !withError;
this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', false);
},
executeBulkEditionProcedure(criterion){
Expand Down
5 changes: 3 additions & 2 deletions src/admin/components/edition/collection-edition-form.vue
Expand Up @@ -204,7 +204,8 @@
ref="enabledViewModesDropdown"
:mobile-modal="true"
:disabled="Object.keys(registeredViewModes).length < 0"
aria-role="list">
aria-role="list"
trap-focus>
<button
class="button is-white"
slot="trigger"
Expand Down Expand Up @@ -297,7 +298,7 @@
<div class="status-radios">
<b-radio
v-model="form.status"
v-for="(statusOption, index) of $statusHelper.getStatuses()"
v-for="(statusOption, index) of $statusHelper.getStatuses().filter((status) => status.slug != 'draft')"
:key="index"
:native-value="statusOption.slug">
<span class="icon has-text-gray">
Expand Down

0 comments on commit 7925186

Please sign in to comment.