scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4903 from sboursen-scinote/sb_SCI-7676

Browse source 
CSS: error messages at moving experiment [SCI-7676]
This commit is contained in:
artoscinote 2023-02-06 11:12:45 +01:00 committed by GitHub
parent 958f9784b0 57838dc813
commit d9beafd9a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/sitewide/form_errors.js
View file

@ -42,8 +42,9 @@ var renderFormError = function(ev, input, errMsgs, clearErr, errAttributes) {
}
var $errSpan = "<span class='help-block'" +
errAttributes + '>' + errorText + '</span>';
errAttributes + '>' + errorText + '.' + '</span>';
$(input).after($errSpan);
$(input).closest('.modal').modal('handleUpdate');
}
var $parent;

3
app/assets/stylesheets/experiments.scss
View file

@ -166,11 +166,12 @@
background: linear-gradient(to right, $color-transparent, $color-white 50%);
bottom: .4em;
content: "";
height: 1.75em;
height: 1.5em;
position: absolute;
right: 0;
text-align: right;
width: 25%;
min-width: 75px;
}
}

8
app/assets/stylesheets/shared/form_errors.scss
View file

@ -4,3 +4,11 @@
color: $brand-danger;
}
}
.form-group.has-error {
margin-bottom: 0;
.form-control {
height: auto;
}
}

2
app/controllers/experiments_controller.rb
View file

@ -319,7 +319,7 @@ class ExperimentsController < ApplicationController
view_type = view_state.state['my_modules']['view_type'] || 'canvas'
path = view_mode_redirect_url(view_type)
else
message = service.errors.values.join(', ')
message = "#{service.errors.values.join('. ')}."
status = :unprocessable_entity
end

2
config/locales/en.yml
View file

@ -1405,7 +1405,7 @@ en:
view: 'View'
head_title: "%{project} | Overview"
canvas_edit: "Edit workflow"
canvas_empty: "It's empty here. Please add some tasks"
canvas_empty: "It's empty here. Please add some tasks."
new_my_module: "New task"
new_my_module_modal:
title: "Create new task"