Skip to content
This repository has been archived by the owner on May 11, 2020. It is now read-only.

Commit

Permalink
fix: fix rero/reroils-app/#11 cancel buttons
Browse files Browse the repository at this point in the history 
Signed-off-by: Peter Weber <Peter.Weber@rero.ch>
  • Loading branch information
@rerowep
rerowep committed Jun 8, 2018
1 parent 5cb7773 commit 704032b
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 42 deletions.
30 changes: 23 additions & 7 deletions reroils_data/documents/form_options/documents/document-v0.0.1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,19 @@
"items": [{
"type": "actions",
"htmlClass": "rero21-submit pull-right",
"items": [{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}]
"items": [
{
"type": "button",
"style": "btn-warning",
"title": "Cancel",
"onClick": "onCancel()"
},
{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}
]
}]
},{
"type": "fieldset",
Expand Down Expand Up @@ -170,11 +178,19 @@
"items": [{
"type": "actions",
"htmlClass": "rero21-submit pull-right",
"items": [{
"items": [
{
"type": "button",
"style": "btn-warning",
"title": "Cancel",
"onClick": "onCancel()"
},
{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}]
}
]
}]
}
]
36 changes: 26 additions & 10 deletions reroils_data/items/form_options/items/item-v0.0.1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,19 @@
"items": [{
"type": "actions",
"htmlClass": "rero21-submit pull-right",
"items": [{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}]
"items": [
{
"type": "button",
"style": "btn-warning",
"title": "Cancel",
"onClick": "onCancel()"
},
{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}
]
}]
},
{
Expand Down Expand Up @@ -107,11 +115,19 @@
"items": [{
"type": "actions",
"htmlClass": "rero21-submit pull-right",
"items": [{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}]
"items": [
{
"type": "button",
"style": "btn-warning",
"title": "Cancel",
"onClick": "onCancel()"
},
{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}
]
}]
}
]
17 changes: 10 additions & 7 deletions reroils_data/locations/form_options/locations/location-v0.0.1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,30 @@
"type": "actions",
"htmlClass": "rero21-submit pull-right",
"items": [{
"type": "button",
"style": "btn-warning",
"title": "Cancel",
"onClick": "onCancel()"
},{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}]
}]
},
{
},{
"type": "fieldset",
"title": "Location",
"items": [{
"key": "pid",
"readonly": true
},{
},{
"key": "code",
"validationMessage": {
"alreadyTakenMessage": "The code is already taken",
"cannotBeVerifiedMessage": "The server cannot verify the code"
}
},{
"key": "name"
}
]
},{
"key": "name"
}]
}
]
16 changes: 10 additions & 6 deletions reroils_data/members/form_options/members/member-v0.0.1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
"type": "actions",
"htmlClass": "rero21-submit pull-right",
"items": [{
"type": "button",
"style": "btn-warning",
"title": "Cancel",
"onClick": "onCancel()"
},{
"type": "submit",
"style": "btn-success",
"title": "Submit"
Expand All @@ -17,19 +22,18 @@
"items": [{
"key": "pid",
"readonly": true
},{
},{
"key": "name"
},{
},{
"key": "code",
"validationMessage": {
"alreadyTakenMessage": "The code is already taken",
"cannotBeVerifiedMessage": "The server cannot verify the code"
}
},{
},{
"key": "address"
},{
},{
"key": "email"
}
]
}]
}
]
13 changes: 11 additions & 2 deletions reroils_data/organisations/form_options/organisations/organisation-v0.0.1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
"type": "actions",
"htmlClass": "rero21-submit pull-right",
"items": [{
"type": "button",
"style": "btn-warning",
"title": "Cancel",
"onClick": "onCancel()"
},{
"type": "submit",
"style": "btn-success",
"title": "Submit"
Expand All @@ -22,13 +27,17 @@
},{
"key": "address"
}]
},
{
},{
"type": "fieldset",
"items": [{
"type": "actions",
"htmlClass": "rero21-submit pull-right",
"items": [{
"type": "button",
"style": "btn-warning",
"title": "Cancel",
"onClick": "onCancel()"
},{
"type": "submit",
"style": "btn-success",
"title": "Submit"
Expand Down
36 changes: 26 additions & 10 deletions reroils_data/patrons/form_options/patrons/patron-v0.0.1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,19 @@
"items": [{
"type": "actions",
"htmlClass": "rero21-submit pull-right",
"items": [{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}]
"items": [
{
"type": "button",
"style": "btn-warning",
"title": "Cancel",
"onClick": "onCancel()"
},
{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}
]
}]
},
{
Expand Down Expand Up @@ -123,11 +131,19 @@
"items": [{
"type": "actions",
"htmlClass": "rero21-submit pull-right",
"items": [{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}]
"items": [
{
"type": "button",
"style": "btn-warning",
"title": "Cancel",
"onClick": "onCancel()"
},
{
"type": "submit",
"style": "btn-success",
"title": "Submit"
}
]
}]
}
]

0 comments on commit 704032b

Please sign in to comment.