Skip to content
GitLab
Explorer
Connexion
S'inscrire
Navigation principale
Rechercher ou aller à…
Projet
P
parlote-facil
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Wiki
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Extraits de code
Compilation
Pipelines
Jobs
Planifications de pipeline
Artéfacts
Déploiement
Releases
Registre de paquets
Registre de conteneur
Registre de modèles
Opération
Environnements
Modules Terraform
Surveillance
Incidents
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse CI/CD
Données d'analyse du dépôt
Expériences du modèle
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
facil
parlote-facil
Validations
4fb62afa
Valider
4fb62afa
rédigé
il y a 13 ans
par
Ilya Zhitomirskiy
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
getting stated links open in new tabs, translated a string
parent
386697f7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
3
Masquer les modifications d'espaces
En ligne
Côte à côte
Affichage de
3 fichiers modifiés
app/helpers/people_helper.rb
+2
-2
2 ajouts, 2 suppressions
app/helpers/people_helper.rb
app/views/users/getting_started.haml
+12
-12
12 ajouts, 12 suppressions
app/views/users/getting_started.haml
config/locales/diaspora/en.yml
+1
-0
1 ajout, 0 suppression
config/locales/diaspora/en.yml
avec
15 ajouts
et
14 suppressions
app/helpers/people_helper.rb
+
2
−
2
Voir le fichier @
4fb62afa
...
...
@@ -32,7 +32,7 @@ module PeopleHelper
opts
[
:class
]
||=
""
opts
[
:class
]
<<
" self"
if
defined?
(
user_signed_in?
)
&&
user_signed_in?
&&
current_user
.
person
==
person
remote_or_hovercard_link
=
"/people/
#{
person
.
id
}
"
.
html_safe
"<a data-hovercard='
#{
remote_or_hovercard_link
}
'
#{
person_href
(
person
)
}
class='
#{
opts
[
:class
]
}
'>
#{
h
(
person
.
name
)
}
</a>"
.
html_safe
"<a data-hovercard='
#{
remote_or_hovercard_link
}
'
#{
person_href
(
person
)
}
class='
#{
opts
[
:class
]
}
'
#{
(
"target="
+
opts
[
:target
])
if
opts
[
:target
]
}
>
#{
h
(
person
.
name
)
}
</a>"
.
html_safe
end
def
person_image_tag
(
person
,
size
=
nil
)
...
...
@@ -45,7 +45,7 @@ module PeopleHelper
if
opts
[
:to
]
==
:photos
link_to
person_image_tag
(
person
,
opts
[
:size
]),
person_photos_path
(
person
)
else
"<a
#{
person_href
(
person
)
}
class='
#{
opts
[
:class
]
}
'>
"<a
#{
person_href
(
person
)
}
class='
#{
opts
[
:class
]
}
'
#{
(
"target="
+
opts
[
:target
])
if
opts
[
:target
]
}
>
#{
person_image_tag
(
person
,
opts
[
:size
])
}
</a>"
.
html_safe
end
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
app/views/users/getting_started.haml
+
12
−
12
Voir le fichier @
4fb62afa
...
...
@@ -43,7 +43,7 @@
=
profile_field_tag
(
current_user
.
person
.
profile
,
attr
)
#edit_profile_button_div
=
link_to
t
(
".edit_profile"
),
edit_profile_path
,
:class
=>
"button"
=
link_to
t
(
".edit_profile"
),
edit_profile_path
,
:class
=>
"button"
,
:target
=>
"_blank"
-
unless
AppConfig
[
:configured_services
].
blank?
%li
.services
{
:class
=>
(
"completed"
if
has_connected_services?
)}
...
...
@@ -79,7 +79,7 @@
=
person_link
(
diasporahq
)
.info
G
et
updates
about the project from the core team.
=
t
(
'.g
et
_
updates
_from_core'
)
.add_to_aspect
=
render
:partial
=>
'people/relationship_action'
,
...
...
@@ -94,13 +94,13 @@
%div
-
Person
.
featured_users
[
0
..
5
].
each
do
|
person
|
.featured_user_card_small
=
person_image_link
(
person
)
=
person_link
(
person
,
:class
=>
"hovercardable"
)
=
person_image_link
(
person
,
:target
=>
"_blank"
)
=
person_link
(
person
,
:class
=>
"hovercardable"
,
:target
=>
"_blank"
)
.tags
-
person
.
profile
.
tags
[
0
..
2
].
each
do
|
tg
|
=
link_to
"#
#{
tg
}
"
,
tag_path
(
tg
.
name
)
=
link_to
"#
#{
tg
}
"
,
tag_path
(
tg
.
name
)
,
:target
=>
"_blank"
=
link_to
"
#{
t
(
'.see_all_featured_users'
)
}
->"
,
featured_users_path
=
link_to
"
#{
t
(
'.see_all_featured_users'
)
}
->"
,
featured_users_path
,
:target
=>
"_blank"
%br
#find_friends_pane
...
...
@@ -112,7 +112,7 @@
.span-5.last
{
:style
=>
"height:30px;"
}
%h4
{
:style
=>
"margin-top:7px;"
}
or
=
link_to
t
(
'.find_friends_from_facebook'
),
friend_finder_path
(
'facebook'
)
=
link_to
t
(
'.find_friends_from_facebook'
),
friend_finder_path
(
'facebook'
)
,
:target
=>
"_blank"
.clearfix
%br
...
...
@@ -134,13 +134,13 @@
%h4
{
:style
=>
"margin-top:7px;"
}
=
t
(
'.featured_tags'
)
%p
=
link_to
"#diaspora"
,
tag_path
(
'diaspora'
)
=
link_to
"#diaspora"
,
tag_path
(
'diaspora'
)
,
:target
=>
"_blank"
%br
=
link_to
"#art"
,
tag_path
(
'art'
)
=
link_to
"#art"
,
tag_path
(
'art'
)
,
:target
=>
"_blank"
%br
=
link_to
"#gif"
,
tag_path
(
'gif'
)
=
link_to
"#gif"
,
tag_path
(
'gif'
)
,
:target
=>
"_blank"
%br
=
link_to
"#french"
,
tag_path
(
'french'
)
=
link_to
"#french"
,
tag_path
(
'french'
)
,
:target
=>
"_blank"
.clearfix
%br
%br
...
...
@@ -152,7 +152,7 @@
.content
%h3
=
t
(
".connect_to"
)
=
link_to
"Cubbi.es"
,
"http://cubbi.es/"
=
link_to
"Cubbi.es"
,
"http://cubbi.es/"
,
:target
=>
"_blank"
%p
=
t
(
'tokens.show.what_is_cubbies'
)
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
config/locales/diaspora/en.yml
+
1
−
0
Voir le fichier @
4fb62afa
...
...
@@ -871,6 +871,7 @@ en:
featured_tags
:
"
Featured
tags"
find_friends
:
"
Find
friends"
see_all_featured_users
:
"
See
all
featured
users"
get_updates_from_core
:
"
Get
updates
about
the
project
from
the
core
team."
hashtag_explanation
:
"
Hashtags
allow
you
to
talk
about
and
follow
your
interests.
They're
also
a
great
way
to
find
new
people
on
Diaspora."
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter