1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-03-15 12:29:16 +01:00

Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev

This commit is contained in:
Du Peng 2022-05-12 11:43:18 +02:00
commit c46a2ba085
7 changed files with 16 additions and 13 deletions

View File

@ -66,14 +66,17 @@ export const FabSocials: React.FC<FabSocialsProps> = ({ show = false, onError, o
return (
<>{show
? <div className='social-icons'>
{fabNetworks.map((network, index) =>
selectedNetworks.includes(network) &&
<a key={index} href={network.url} target='_blank' rel="noreferrer">
<img src={`${Icons}#${network.name}`}></img>
</a>
)}
</div>
? (selectedNetworks.length > 0) && <>
<h2>{t('app.shared.fab_socials.follow_us')}</h2>
<div className='social-icons'>
{fabNetworks.map((network, index) =>
selectedNetworks.includes(network) &&
<a key={index} href={network.url} target='_blank' rel="noreferrer">
<img src={`${Icons}#${network.name}`}></img>
</a>
)}
</div>
</>
: <form onSubmit={handleSubmit(onSubmit)}>
<div className='social-icons'>

View File

@ -40,7 +40,7 @@
}'>
</div>
<span class="help-block text-info text-xs"><i class="fa fa-lightbulb-o"></i> {{ 'app.admin.settings.drag_and_drop_to_insert_images' | translate }}</span>
<span class="help-block text-info text-xs"><i class="fa fa-lightbulb-o"></i> {{ 'app.admin.settings.drag_and_drop_to_insert_images' | translate }} (max. 1200px)</span>
<button name="button" class="btn btn-warning" ng-click="save(aboutBodySetting)" translate>{{ 'app.shared.buttons.save' }}</button>
</div>
<div class="col-md-4 col-md-offset-2">

View File

@ -26,7 +26,6 @@
<h2 class="about-title-aside" translate>{{ 'app.public.about.your_fablab_s_contacts' }}</h2>
<span ng-bind-html="aboutContacts.value"></span>
<div class="m-t-xl">
<h2 translate>{{ 'app.public.home.follow_us' }}</h2>
<fab-socials show="true" />
</div>
</div>

View File

@ -1288,7 +1288,7 @@ en:
title_of_the_about_page: "Title of the About page"
shift_enter_to_force_carriage_return: "SHIFT + ENTER to force carriage return"
input_the_main_content: "Input the main content"
drag_and_drop_to_insert_images: "Drap and drop to insert images"
drag_and_drop_to_insert_images: "Drag and drop to insert images"
input_the_fablab_contacts: "Input the FabLab contacts"
reservations: "Reservations"
reservations_parameters: "Reservations parameters"

View File

@ -1171,7 +1171,7 @@
title_of_the_about_page: "Title of the About page"
shift_enter_to_force_carriage_return: "SHIFT + ENTER to force carriage return"
input_the_main_content: "Input the main content"
drag_and_drop_to_insert_images: "Drap and drop to insert images"
drag_and_drop_to_insert_images: "Drag and drop to insert images"
input_the_fablab_contacts: "Input the FabLab contacts"
reservations: "Reservasjoner"
reservations_parameters: "Reservations parameters"

View File

@ -142,7 +142,7 @@ en:
#home page
home:
latest_documented_projects: "The latest documented projects"
follow_us: "Follow Us"
follow_us: "Follow us"
latest_tweets: "The latest tweets"
latest_registered_members: "Latest registered members"
create_an_account: "Create an account"

View File

@ -39,6 +39,7 @@ en:
add_video: "Embed a video"
add_image: "Insert an image"
fab_socials:
follow_us: "Follow us"
networks_update_success: "Social networks update successful"
networks_update_error: "Problem trying to update social networks"
url_placeholder: "Paste url…"