Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:sciencespo/isari into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
paulgirard committed Feb 24, 2017
2 parents 2982811 + a20cb45 commit bf30c57
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion client/src/app/app.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ footer:hover {
}

.document_button {
width: 143px;
width: 70px;
}

.any_question {
Expand Down
6 changes: 3 additions & 3 deletions client/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a class="link_footer" target="blank" href="http://www.sciencespo.fr/scpolib/ISARI/ISARI_MentionsLegales.pdf">{{ 'footermentions' | translate }}</a>&nbsp;&nbsp;|&nbsp;&nbsp;
<a class="link_footer" target="blank" href="http://www.sciencespo.fr/ressources-numeriques/content/gerez-vos-acces">{{ 'footeraccess' | translate }}</a>&nbsp;&nbsp;
<button class="document_button" [md-menu-trigger-for]="menu" md-menu-item>
Documentation
{{ 'help' | translate }}
</button>
</div>
<div class="any_question">
Expand All @@ -18,6 +18,6 @@
</footer>

<md-menu y-position="above" x-position="after" #menu="mdMenu">
<a md-menu-item href="http://www.sciencespo.fr/scpolib/ISARI/ISARI_Guide_Utilisateur.pdf" target="_blank">{{ 'user_guide' | translate }}</a>
<a md-menu-item href="http://www.sciencespo.fr/scpolib/ISARI/ISARI_Liste_Champs.pdf" target="_blank">{{ 'fields_list' | translate }}</a>
<a md-menu-item href="http://www.sciencespo.fr/scpolib/ISARI/ISARI_Guide_Utilisateur.pdf" target="_blank">{{ 'user_guide' | translate }}</a>
<a md-menu-item href="http://www.sciencespo.fr/scpolib/ISARI/ISARI_Liste_Champs.pdf" target="_blank">{{ 'fields_list' | translate }}</a>
</md-menu>
1 change: 1 addition & 0 deletions client/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
},
"no matching": "Aucune correspondance ?",
"add": "Add",
"help": "Help",
"user_guide": "User's guide",
"fields_list": "Fields list"
}
1 change: 1 addition & 0 deletions client/src/assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
},
"no matching": "Aucune correspondance ?",
"add": "Ajouter",
"help": "Aide",
"user_guide": "Guide utilisateur",
"fields_list": "Liste des champs"
}

0 comments on commit bf30c57

Please sign in to comment.