Commit cadc3c62 authored by Adrien PARROT's avatar Adrien PARROT
Browse files

Add git help on Search, Mapper, ConceptDetailPages

parent dedd8acb
......@@ -381,9 +381,12 @@ sap.ui.jsview("conceptmapper.conceptDetailPage", {
subHeader : oSubHeader,
headerContent : [
// new sap.m.Button({
// // text:"lol",
// icon : "sap-icon://sys-help"
// }),
// icon : "sap-icon://home-share",
// text: "Git",
// press: function() {
// window.open('https://framagit.org/interchu/conceptual-mapping');
// }
// }),
new sap.m.Button({
text: '{loginModel>/m_username}',
......@@ -398,7 +401,7 @@ sap.ui.jsview("conceptmapper.conceptDetailPage", {
press: [ oController.logout, oController ],
})
],
],
content : [ oConceptDetailPanel,
//oCommentPanel,
oContentPanel ]
......
sap.ui.controller("conceptmapper.mapperPage", {
......
......@@ -641,9 +641,12 @@ sap.ui.jsview("conceptmapper.mapperPage", {
},
headerContent : [
// new sap.m.Button({
// // text:"lol",
// icon : "sap-icon://sys-help"
// }),
// icon : "sap-icon://home-share",
// text: "Git",
// press: function() {
// window.open('https://framagit.org/interchu/conceptual-mapping');
// }
// }),
new sap.m.Button({
text: '{loginModel>/m_username}',
......
......@@ -80,10 +80,10 @@ sap.ui.jsview("conceptmapper.registrationPage", {
navButtonPress : function(oEvt) {
app.back();
},
headerContent : [ new sap.m.Button({
// text:"lol",
icon : "sap-icon://sys-help"
}) ],
// headerContent : [ new sap.m.Button({
// // text:"lol",
// icon : "sap-icon://sys-help"
// }) ],
showSubHeader : true,
subHeader : oSubHeader,
content : [ oRegistrationForm
......
......@@ -613,43 +613,52 @@ sap.ui.jsview("conceptmapper.searchPage", {
navButtonPress : function(oEvt) {
app.back();
},
headerContent : [
new sap.m.Button({
id: 'usersParam',
icon : "sap-icon://collaborate",
visible: false,
press: [ oController.goToUserPage, oController ],
}),
// new sap.m.Button({
// // text:"lol",
// icon : "sap-icon://sys-help"
// }),
new sap.m.Button({
id: 'registrationSearch',
icon : "sap-icon://employee",
type: "Accept",
press: [ oController.userAuthentification, oController ],
}),
new sap.m.Button({
id: 'loginSearch',
text: '{loginModel>/m_username}',
icon : "sap-icon://employee",
enabled:false, /// to change
visible: false,
press: [ oController.userInfos, oController ],
}),
new sap.m.Button({
id: 'logoutSearch',
text: 'Log-out',
icon : "sap-icon://decline",
visible: false,
press: [ oController.logout, oController ],
customHeader : new sap.m.Bar({
contentLeft: new sap.m.Button({
icon : "sap-icon://home-share",
text: "Git",
press: function() {
window.open('https://framagit.org/interchu/conceptual-mapping');
}
}),
contentMiddle: new sap.m.Title({
text: "{i18n>app_head}",
}),
contentRight: [
new sap.m.Button({
id: 'usersParam',
icon : "sap-icon://collaborate",
visible: false,
press: [ oController.goToUserPage, oController ],
}),
new sap.m.Button({
id: 'registrationSearch',
icon : "sap-icon://employee",
type: "Accept",
press: [ oController.userAuthentification, oController ],
}),
new sap.m.Button({
id: 'loginSearch',
text: '{loginModel>/m_username}',
icon : "sap-icon://employee",
enabled:false, /// to change
visible: false,
press: [ oController.userInfos, oController ],
}),
new sap.m.Button({
id: 'logoutSearch',
text: 'Log-out',
icon : "sap-icon://decline",
visible: false,
press: [ oController.logout, oController ],
})
],
]}),
content : [oToolbarConceptsNumber, oToolbarControls, oTable ],
footer: new sap.m.Bar({
contentLeft: new sap.m.Button({
......
......@@ -8,6 +8,9 @@ app_subhead_search=Search by id
search_placeholder=Search (id)
CSV_upload=Upload File
research=Research
#registrationPage
registration_page=Registration page
submit=Submit
#userPage
app_subhead_csv=manage users (you can only select one user)
create_user=Create
......@@ -60,13 +63,6 @@ connexion=Connexion
first_time=First time here?
username=Username
password=Password
#registrationPage
registration_page=Registration page
submit=Submit
firstname=Firstname
lastname=Lastname
email=Email
address=Address
#DetailPage
concept_detail=Details of selected concept
relationship_table=Relationships table (with the selected concept)
......
......@@ -8,6 +8,9 @@ app_subhead_search=Recherche par id
search_placeholder=Recherche (id)
CSV_upload=T\u00e9l\u00e9chargement
research=Recherche
#registrationPage
registration_page=Page d'enregistration
submit=Soumettre
#userPage
app_subhead_csv=Utilisateurs (un seul utilisateur peut \u00eatre s\u00e9lectionn\u00e9 \u00e0 la fois)
create_user=Cr\u00e9ation
......@@ -60,13 +63,6 @@ connexion=Connexion
first_time=Premi\u00e8re fois ici ?
username=Nom d'utilisateur
password=Mot de passe
#registrationPage
registration_page=Page d'enregistration
submit=Soumettre
firstname=Pr\u00e9nom
lastname=Nom de famille
email=Email
address=Adresse
#DetailPage
concept_detail=D\u00e9tail du concept s\u00e9lectionn\u00e9
relationship_table=Tableau des relations (avec le concept s\u00e9lectionn\u00e9)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment