Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ERMS-6116 #2205

Merged
merged 3 commits into from
Dec 19, 2024
Merged

ERMS-6116 #2205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd5a4ae
ERMS-6116
Inselhopper Dec 16, 2024
fb9736d
ERMS-6116
Inselhopper Dec 16, 2024
9ea01f6
ERMS-6116
Inselhopper Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions files/frontend/semantic/src/themes/laser/elements/icon.overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,6 @@ i.icon.la-objectIsMine.fixed {
right: 0;
}

i.bordered.icon.la-radioButton {
box-shadow: @blue 0px 0px 0px 0.1em inset;
i.bordered.icon.la-checkButton {
box-shadow: @blue 0px 0px 0px 0.2em inset;
}
4 changes: 2 additions & 2 deletions grails-app/assets/themes/accessibility/semantic.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38429,8 +38429,8 @@ i.icon.la-objectIsMine.fixed {
right: 0;
}

i.bordered.icon.la-radioButton {
box-shadow: #004678 0px 0px 0px 0.1em inset;
i.bordered.icon.la-checkButton {
box-shadow: #004678 0px 0px 0px 0.2em inset;
}
/*!
* # Fomantic-UI 2.9.3 - Image
Expand Down
2 changes: 1 addition & 1 deletion grails-app/assets/themes/accessibility/semantic.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions grails-app/assets/themes/laser/semantic.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38279,8 +38279,8 @@ i.icon.la-objectIsMine.fixed {
right: 0;
}

i.bordered.icon.la-radioButton {
box-shadow: #004678 0px 0px 0px 0.1em inset;
i.bordered.icon.la-checkButton {
box-shadow: #004678 0px 0px 0px 0.2em inset;
}
/*!
* # Fomantic-UI 2.9.3 - Image
Expand Down
2 changes: 1 addition & 1 deletion grails-app/assets/themes/laser/semantic.min.css
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions grails-app/views/addressbook/_person_table.gsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<th>${message(code: 'person.contacts.label')}</th>
</g:if>
<g:if test="${tmplConfigItem.equalsIgnoreCase('surveyInvoicingInformation')}">
<th>${message(code: 'surveyOrg.person.selected')}</th>
<th class="center aligned la-th-wrap">${message(code: 'surveyOrg.person.selected')}</th>
</g:if>
</g:each>
<g:if test="${showOptions}">
Expand Down Expand Up @@ -275,38 +275,38 @@
</td>
</g:if>
<g:if test="${tmplConfigItem.equalsIgnoreCase('surveyInvoicingInformation')}">
<td>
<td class="center aligned">
<g:if test="${editable && controllerName == 'myInstitution'}">
<g:if test="${SurveyOrg.findByOrgAndSurveyConfigAndPerson(participant, surveyConfig, person)}">
<g:link controller="myInstitution" action="surveyInfos"
params="[id: surveyInfo.id, surveyConfigID: surveyConfig.id, setConcact: false, personId: person.id, setSurveyInvoicingInformation: true, viewTab: 'invoicingInformation']">
<i class="${Icon.SYM.YES} bordered large green"></i>
<i class="${Icon.SYM.SET} large "></i>
</g:link>
</g:if>
<g:else>
<g:link controller="myInstitution" action="surveyInfos"
params="[id: surveyInfo.id, surveyConfigID: surveyConfig.id, setConcact: true, personId: person.id, setSurveyInvoicingInformation: true, viewTab: 'invoicingInformation']">
<i class="${Icon.SYM.NO} bordered large red"></i>
<i class="${Icon.SYM.UNSET} large"></i>
</g:link>
</g:else>
</g:if>
<g:elseif test="${editable && controllerName == 'survey'}">
<g:if test="${SurveyOrg.findByOrgAndSurveyConfigAndPerson(participant, surveyConfig, person)}">
<g:link controller="survey" action="evaluationParticipant"
params="[id: surveyInfo.id, surveyConfigID: surveyConfig.id, setConcact: false, personId: person.id, setSurveyInvoicingInformation: true, viewTab: 'invoicingInformation', participant: participant.id]">
<i class="${Icon.SYM.YES} bordered large green"></i>
<i class="${Icon.SYM.SET} large"></i>
</g:link>
</g:if>
<g:else>
<g:link controller="survey" action="evaluationParticipant"
params="[id: surveyInfo.id, surveyConfigID: surveyConfig.id, setConcact: true, personId: person.id, setSurveyInvoicingInformation: true, viewTab: 'invoicingInformation', participant: participant.id]">
<i class="${Icon.SYM.NO} bordered large red"></i>
<i class="${Icon.SYM.UNSET} large"></i>
</g:link>
</g:else>
</g:elseif>
<g:else>
<g:if test="${SurveyOrg.findByOrgAndSurveyConfigAndPerson(participant, surveyConfig, person)}">
<i class="${Icon.SYM.YES} bordered large green"></i>
<i class="${Icon.SYM.SET} large"></i>
</g:if>
</g:else>
</td>
Expand Down
8 changes: 4 additions & 4 deletions src/main/groovy/de/laser/ui/Icon.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,10 @@ class Icon {
// please do not touch during refactoring ..
// convenient symbols

@UIDoc(usage = 'Generic symbol for: Radio Button Not Set (see also SET)')
public static String UNSET = 'blue bordered circular icon la-radioButton'
@UIDoc(usage = 'Generic symbol for: Radio Button Set (see also UNSET)')
public static String SET = 'blue bordered circular circle icon la-radioButton'
@UIDoc(usage = 'Generic symbol for: Check Button Not Set (see also SET)')
public static String UNSET = 'blue bordered icon la-checkButton'
@UIDoc(usage = 'Generic symbol for: Check Button Set (see also UNSET)')
public static String SET = 'blue bordered check icon la-checkButton'

@UIDoc(usage = 'Generic symbol for: Yes/Accept/Done (see also NO)')
public static String YES = 'check icon'
Expand Down