10000 Fix #156: Add link opener button for arrayfield of urlfields · thecodinghouse/django-jsonform@3eb8faa · GitHub
[go: up one dir, main page]
Skip to content

Commit 3eb8faa

Browse files
bhchbhch
committed
Fix bhch#156: Add link opener button for arrayfield of urlfields
1 parent 18533e8 commit 3eb8faa

File tree

2 files changed

+28
-7
lines changed

2 files changed

+28
-7
lines changed

‎django_jsonform/forms/fields.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,12 @@ def get_schema(self):
109109

110110
if isinstance(self.base_field, ArrayFormField):
111111
items = self.base_field.get_schema()
112-
elif isinstance(self.base_field, models.IntegerField):
112+
elif isinstance(self.base_field, django.forms.IntegerField):
113113
items = {'type': 'number'}
114114
else:
115115
items = {'type': 'string'}
116+
if isinstance(self.base_field, django.forms.URLField):
117+
items['format'] = 'uri-reference'
116118

117119
schema['items'] = items
118120

‎django_jsonform/static/django_jsonform/style.css

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -921,15 +921,15 @@ div.form-row::after {
921921
cursor: pointer;
922922
}
923923

924-
.rjf-autocomplete-field {
924+
.rjf-autocomplete-field, .rjf-url-field {
925925
position: relative;
926926
}
927927
.rjf-autocomplete-field-input {
928928
cursor: pointer;
929929
padding-right: 40px !important;
930930
background-color: transparent !important;
931931
}
932-
.rjf-autocomplete-field-clear-button {
932+
.rjf-autocomplete-field-clear-button, .rjf-url-field-link {
933933
position: absolute;
934934
right: 6px;
935935
top: 5px;
@@ -941,10 +941,12 @@ div.form-row::after {
941941
z-index: 10;
942942
cursor: pointer;
943943
}
944-
.rjf-autocomplete-field.has-label .rjf-autocomplete-field-clear-button {
944+
.rjf-autocomplete-field.has-label .rjf-autocomplete-field-clear-button,
945+
.rjf-url-field.has-label .rjf-url-field-link {
945946
top: 5px;
946947
}
947-
.rjf-autocomplete-field-clear-button:hover {
948+
.rjf-autocomplete-field-clear-button:hover,
949+
.rjf-url-field-link:hover {
948950
background-color: var(--darkened-bg);
949951
color: var(--link-hover-color);
950952
}
@@ -1016,6 +1018,20 @@ div.form-row::after {
10161018
background-color: transparent;
10171019
}
10181020

1021+
.rjf-url-field-input {
1022+
padding-right: 34px !important;
1023+
}
1024+
.rjf-url-field-link {
1025+
right: 4px;
1026+
padding-right: 4px;
1027+
}
1028+
.rjf-url-field-link > span {
1029+
display: none;
1030+
}
1031+
.rjf-url-field-link > .rjf-icon {
1032+
vertical-align: middle;
1033+
}
1034+
10191035
.rjf-file-field-loading {
10201036
margin-top: 0.6em;
10211037
vertical-align: middle;
@@ -1072,7 +1088,9 @@ div.form-row::after {
10721088
}
10731089

10741090
.rjf-autocomplete-field.has-label .rjf-autocomplete-field-clear-button,
1075-
.rjf-autocomplete-field-clear-button {
1091+
.rjf-autocomplete-field-clear-button,
1092+
.rjf-url-field.has-label .rjf-url-field-link,
1093+
.rjf-url-field-link {
10761094
top: 8px;
10771095
}
10781096
.rjf-autocomplete-field-search input {
@@ -1162,7 +1180,8 @@ div.form-row::after {
11621180
width: calc(100% + 60px);
11631181
}
11641182

1165-
.rjf-autocomplete-field.has-label .rjf-autocomplete-field-clear-button {
1183+
.rjf-autocomplete-field.has-label .rjf-autocomplete-field-clear-button,
1184+
.rjf-url-field.has-label .rjf-url-field-link {
11661185
top: 32px;
11671186
}
11681187

0 commit comments

Comments
 (0)
0