tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/tainacan/tainacan into develop

This commit is contained in:
weryques 2018-03-21 14:49:48 -03:00
parent 4f41488dd9 5f0e413eca
commit afb5333841
4 changed files with 119 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/admin/components/edition/field-edition-form.vue
View File

@ -76,7 +76,7 @@
name="multiple">
{{ $i18n.get('label_allow_multiple') }}
</b-checkbox>
<a class="help-button"><b-icon size="is-small" icon="help-circle-outline"></b-icon></a>
<a class="help-button"> <b-icon size="is-small" icon="help-circle-outline"></b-icon></a>
</b-field>
<b-field

12
src/admin/components/other/help-tooltip.vue
View File

@ -25,14 +25,16 @@ export default {
background-color: #e8f9f5;
border: 1px solid #338591;
border-radius: 10px;
margin: 0;
margin: 0px 0px 14px -37px;
position: absolute;
z-index: 99999999999999;
top: 0%;
bottom: 100%;
left: 0%;
display: block;
min-width: 250px;
.help-tooltip-header {
padding: 0.8em 1.2em 0.6em 1.2em;
padding: 0.8em 0.8em 0.6em 0.8em;
border-bottom: 1px solid #909293;
font-size: 18px;
font-weight: bold;
@ -48,7 +50,7 @@ export default {
content: "";
display: block;
position: absolute;
left: 10%;
left: 24px;
width: 0;
height: 0;
border-style: solid;

1
src/admin/scss/tainacan-admin.scss
View File

@ -102,6 +102,7 @@ html {
a.help-button, a.help-button i, a.help-button i::before{
font-size: 0.9em !important;
color: $gray;
position: relative;
&:hover {
color: $primary !important;
i, i::before {color: $primary !important;}

110
src/admin/tainacan-admin-i18n.php
View File

@ -1,6 +1,7 @@
<?php
return [
<<<<<<< HEAD
// Tainacan common terms
'repository' => __( 'Repository', 'tainacan' ),
'collections' => __( 'Collections', 'tainacan' ),
@ -15,6 +16,35 @@ return [
'filter' => __( 'Filter', 'tainacan' ),
'category' => __( 'Category', 'tainacan' ),
'event' => __( 'Event', 'tainacan' ),
=======
// Tainacan common terms
'repository' => __('Repository', 'tainacan'),
'collections' => __('Collections', 'tainacan'),
'items' => __('Items', 'tainacan'),
'fields' => __('Fields', 'tainacan'),
'filters' => __('Filters', 'tainacan'),
'categories' => __('Categories', 'tainacan'),
'events' => __('Events', 'tainacan'),
'collection' => __('Collection', 'tainacan'),
'item' => __('Item', 'tainacan'),
'field' => __('Field', 'tainacan'),
'filter' => __('Filter', 'tainacan'),
'category' => __('Category', 'tainacan'),
'event' => __('Event', 'tainacan'),
// Actions
'edit' => __('Edit', 'tainacan'),
'new' => __('New', 'tainacan'),
'import' => __('Import', 'tainacan'),
'export' => __('Export', 'tainacan'),
'cancel' => __('Cancel', 'tainacan'),
'save' => __('Save', 'tainacan'),
'next' => __('Next', 'tainacan'),
'see' => __('See', 'tainacan'),
'search' => __('Search', 'tainacan'),
'advanced_search' => __('Advanced Search', 'tainacan'),
'continue' => __('Continue', 'tainacan'),
>>>>>>> 5f0e413ecaa5f8074994ea72f0e6f10b00709a73
// Actions
'edit' => __( 'Edit', 'tainacan' ),
@ -38,6 +68,7 @@ return [
'publish_visibility' => __( 'Visible to everyone', 'tainacan' ),
'private_visibility' => __( 'Visible only for editors', 'tainacan' ),
<<<<<<< HEAD
// Page Titles (used mainly on Router)
'title_collections_page' => __( 'Collections Page', 'tainacan' ),
'title_items_page' => __( 'Items Page', 'tainacan' ),
@ -49,6 +80,60 @@ return [
'title_collection_page' => __( 'Collection Page', 'tainacan' ),
'title_item_page' => __( 'Item Page', 'tainacan' ),
'title_field_page' => __( 'Field Page', 'tainacan' ),
=======
// Labels (used mainly on Aria Labels and Inputs)
'label_menu' => __('Menu', 'tainacan'),
'label_main_menu' => __('Main Menu', 'tainacan'),
'label_collection_menu' => __('Collection Menu', 'tainacan'),
'label_title' => __('Title', 'tainacan'),
'label_actions' => __('Actions', 'tainacan'),
'label_name' => __('Name', 'tainacan'),
'label_description' => __('Description', 'tainacan'),
'label_status' => __('Status', 'tainacan'),
'label_slug' => __('Slug', 'tainacan'),
'label_image' => __('Image', 'tainacan'),
'label_thumbnail' => __('Thumbnail', 'tainacan'),
'label_button_view' => __('Button View', 'tainacan'),
'label_button_edit' => __('Button Edit', 'tainacan'),
'label_button_delete' => __('Button Delete', 'tainacan'),
'label_button_edit_thumb' => __('Button Edit Thumbnail', 'tainacan'),
'label_button_delete_thumb' => __('Button Delete Thumbnail', 'tainacan'),
'label_collections_per_page' => __('Collections per Page:', 'tainacan'),
'label_items_per_page' => __('Items per Page:', 'tainacan'),
'label_active_fields' => __('Active Fields', 'tainacan'),
'label_available_fields' => __('Available Fields', 'tainacan'),
'label_available_field_types' => __('Available Field Types', 'tainacan'),
'label_active_filters' => __('Active Filters', 'tainacan'),
'label_filter_type' => __('Filter Type', 'tainacan'),
'label_available_filters' => __('Available Filters', 'tainacan'),
'label_available_filter_types' => __('Available Filter Types', 'tainacan'),
'label_per_page' => __('per Page', 'tainacan'),
'label_table_fields' => __('Fields on table', 'tainacan'),
'label_required' => __('Required', 'tainacan'),
'label_allow_multiple' => __('Allow multiple values', 'tainacan'),
'label_default_value' => __('Default value', 'tainacan'),
'label_unique_value' => __('Unique value', 'tainacan'),
'label_yes' => __('Yes', 'tainacan'),
'label_no' => __('No', 'tainacan'),
'label_collection_related' => __('Collection Related', 'tainacan'),
'label_fields_for_search' => __('Fields for search', 'tainacan'),
'label_allow_repeated_items' => __('Allow repeated items', 'tainacan'),
'label_select_category' => __('Select category', 'tainacan'),
'label_select_category_input_type' => __('Input type', 'tainacan'),
'label_category_allow_new_terms' => __('Allow new terms', 'tainacan'),
'label_selectbox_init' => __('Select', 'tainacan'),
'label_insert_options' => __('Insert options', 'tainacan'),
'label_options' => __('Options', 'tainacan'),
'label_attachments' => __('Attachments', 'tainacan'),
'label_enabled' => __('Enabled', 'tainacan'),
'label_disabled' => __('Disabled', 'tainacan'),
'label_creation' => __('Creation', 'tainacan'),
'label_collection_items' => __('Collection Items', 'tainacan'),
'label_collection_fields' => __('Collection Fields', 'tainacan'),
'label_collection_filters' => __('Collection Filters', 'tainacan'),
'label_parent_term' => __('Parent Term', 'tainacan'),
'label_add_new_term' => __('Add New Term', 'tainacan'),
>>>>>>> 5f0e413ecaa5f8074994ea72f0e6f10b00709a73
/* translators: alkdjklasdj laksjd klsadj */
'title_filter_page' => __( 'Filter Page', 'tainacan' ),
@ -65,6 +150,7 @@ return [
'title_filter_edition' => __( 'Filter Edition Page', 'tainacan' ),
'title_collection_fields_edition' => __( 'Collection Fields Edition Page', 'tainacan' ),
<<<<<<< HEAD
// Labels (used mainly on Aria Labels and Inputs)
'label_menu' => __( 'Menu', 'tainacan' ),
'label_main_menu' => __( 'Main Menu', 'tainacan' ),
@ -117,6 +203,30 @@ return [
'label_collection_filters' => __( 'Collection Filters', 'tainacan' ),
'label_parent_term' => __( 'Parent Term', 'tainacan' ),
'label_add_new_term' => __( 'Add New Term', 'tainacan' ),
=======
// Info. Other feedback to user.
'info_name_is_required' => __('Name is required.', 'tainacan'),
'info_no_collection_created' => __('No collection was created in this repository.', 'tainacan'),
'info_no_item_created' => __('No item was created in this collection.', 'tainacan'),
'info_error_deleting_collection' => __('Error on deleting collection.', 'tainacan'),
'info_collection_deleted' => __('Collection deleted.', 'tainacan'),
'info_item_deleted' => __('Item deleted.', 'tainacan'),
'info_warning_collection_delete' => __('Do you really want to delete this collection?', 'tainacan'),
'info_warning_item_delete' => __('Do you really want to delete this item?', 'tainacan'),
'info_warning_selected_collections_delete' => __('Do you really want to delete the selected collections?', 'tainacan'),
'info_warning_selected_items_delete' => __('Do you really want to delete the selected items?', 'tainacan'),
'info_warning_collection_related' => __('The field Collection related is required', 'tainacan'),
'info_warning_no_fields_found' => __('No fields found in this collection', 'tainacan'),
'info_showing_items' => __('Showing items ', 'tainacan'),
'info_showing_collections' => __('Showing collections ', 'tainacan'),
'info_to' => __(' to ', 'tainacan'),
'info_of' => __(' of ', 'tainacan'),
'info_created_by' => __('Created by: ', 'tainacan'),
'info_date' => __('Date: ', 'tainacan'),
'info_not_saved' => __('Not saved ', 'tainacan'),
'info_warning_fields_not_saved' => __('Are you sure? There are fields not saved, changes will be lost.', 'tainacan'),
'info_warning_filters_not_saved' => __('Are you sure? There are filters not saved, changes will be lost.', 'tainacan'),
>>>>>>> 5f0e413ecaa5f8074994ea72f0e6f10b00709a73
// Instructions. More complex sentences to guide user and placeholders
'instruction_dragndrop_fields_collection' => __( 'Drag and drop Fields here to Collection.', 'tainacan' ),