56
56
class =" pkpButton cursor-pointer border-transparent py-2 text-lg-semibold text-primary hover:enabled:underline"
57
57
@click =" toggleEditMode(affiliationIndex)"
58
58
>
59
- <MultilingualProgress
60
- v-bind =" {
61
- count: translations(affiliation).count,
62
- total: translations(affiliation).total,
63
- }"
59
+ <Icon
60
+ :icon ="
61
+ translations(affiliation).count ===
62
+ translations(affiliation).total
63
+ ? 'Complete'
64
+ : 'InProgress'
65
+ "
66
+ :class =" 'mr-2 h-6 w-6'"
67
+ :inline =" true"
64
68
/>
65
69
  ;
66
70
{{ translations(affiliation).label }}
100
104
}}
101
105
</label >
102
106
</div >
103
- <div >
107
+ <div class = " pkpFormField--sizelarge " >
104
108
<input
105
109
v-if ="
106
110
supportedFormLocaleKeys.includes(affiliationNameLocale)
197
201
class =" cursor-pointer border-transparent px-2 py-2 text-lg-normal text-primary hover:bg-hover hover:text-on-dark hover:enabled:underline"
198
202
target =" _blank"
199
203
>
200
- <Icon :icon =" 'external-link'" :inline =" true" />
204
+ <span
205
+ class =" fa fa-external-link pkpIcon--inline mr-2 inline-block h-6 w-6 align-middle rtl:scale-x-[-1]"
206
+ aria-hidden =" true"
207
+ ></span >
201
208
</a >
202
209
</li >
203
210
</ul >
207
214
<div v-if =" showNewAffiliation" >
208
215
<div >
209
216
<span class =" inline-block py-2 text-lg-semibold" >
210
- <MultilingualProgress
211
- v-bind =" {
212
- count: translations(newAffiliation).count,
213
- total: translations(newAffiliation).total,
214
- }"
217
+ <Icon
218
+ :icon ="
219
+ translations(newAffiliation).count ===
220
+ translations(newAffiliation).total
221
+ ? 'Complete'
222
+ : 'InProgress'
223
+ "
224
+ :class =" 'mr-2 h-6 w-6'"
225
+ :inline =" true"
215
226
/>
216
227
  ;
217
228
{{ translations(newAffiliation).label }}
259
270
}}
260
271
</span >
261
272
</div >
262
- <div >
273
+ <div class = " pkpFormField--sizelarge " >
263
274
<input
264
275
v-if ="
265
276
supportedFormLocaleKeys.includes(
283
294
</div >
284
295
</TableCell >
285
296
<TableCell >
286
- <div v-if = " showNewAffiliation " >
297
+ <div >
287
298
<button
288
- class =" pkpButton cursor-pointer border-transparent py-2 text-lg-semibold text-primary hover:enabled:underline"
289
- :disabled =" !validate(newAffiliation)"
299
+ class =" pkpButton border-transparent py-2 text-lg-semibold text-primary"
300
+ :class ="
301
+ !showNewAffiliation
302
+ ? 'disabled'
303
+ : 'cursor-pointer hover:enabled:underline'
304
+ "
305
+ :disabled =" !showNewAffiliation"
290
306
@click =" addAffiliation"
291
307
>
292
308
{{ t('common.add', {}) }}
293
309
</button >
294
310
<br />
295
311
<button
312
+ v-if =" showNewAffiliation"
296
313
class =" pkpButton cursor-pointer border-transparent py-2 text-lg-semibold text-primary hover:enabled:underline"
297
314
@click =" closeNewAffiliation"
298
315
>
@@ -312,7 +329,6 @@ import {ref, computed, onMounted, watch, onBeforeUnmount} from 'vue';
312
329
import {t } from ' @/utils/i18n' ;
313
330
import DropdownActions from ' @/components/DropdownActions/DropdownActions.vue' ;
314
331
import Icon from ' @/components/Icon/Icon.vue' ;
315
- import MultilingualProgress from ' @/components/MultilingualProgress/MultilingualProgress.vue' ;
316
332
import PkpTable from ' @/components/Table/Table.vue' ;
317
333
import TableHeader from ' @/components/Table/TableHeader.vue' ;
318
334
import TableBody from ' @/components/Table/TableBody.vue' ;
@@ -580,11 +596,6 @@ const translations = function (affiliation) {
580
596
return result;
581
597
};
582
598
583
- /** Validates an affiliation */
584
- const validate = function (affiliation ) {
585
- return !! (affiliation .ror || affiliation .name [primaryLocale]);
586
- };
587
-
588
599
/** Watch for changes in currentValue to ensure compatibility */
589
600
watch (
590
601
currentValue,
@@ -702,6 +713,7 @@ function sortNamesPrimaryFirst(names) {
702
713
703
714
table td a {
704
715
display : inline-block ;
716
+ line-height : 24px ;
705
717
}
706
718
707
719
table td :nth- child(3 ) {
@@ -713,10 +725,10 @@ function sortNamesPrimaryFirst(names) {
713
725
background-color : #fff ;
714
726
height : auto ;
715
727
max-height : 200px ;
728
+ overflow-x : hidden ;
716
729
overflow-y : scroll ;
717
730
position : absolute ;
718
731
z-index : 9999 ;
719
- border : 1px solid #ccc ;
720
732
min-width : 30% ;
721
733
722
734
ul {
@@ -736,11 +748,17 @@ function sortNamesPrimaryFirst(names) {
736
748
737
749
ul li :nth- child(1 n + 2 ) a :nth- child(1 ) {
738
750
width : calc (100% - 30px );
751
+ text-wrap : nowrap ;
739
752
}
740
753
741
754
ul li :nth- child(1 n + 2 ) a :nth- child(2 ) {
742
755
float : right ;
743
756
width : 30px ;
757
+ display : block ;
758
+ }
759
+
760
+ ul li :nth- child(1 n + 2 ) a :nth- child(2 ) span {
761
+ line-height : inherit ;
744
762
}
745
763
}
746
764
</style >
0 commit comments