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

Update to latest versions of Bootsrap/JQuery/JQueryUI and Datetimepicker #124

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to latest versions of Bootsrap/JQuery/JQueryUI and Datetimepicker #124

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
736837c
Update to latest versions of Bootsrap/JQuery/JQueryUI and Datetimepicker
herrtunante Jan 17, 2023
f4e929c
updated webapp earthFiles folder
SteRiccio Jan 17, 2023
a53aad6
Merge branch 'master' of github.com:openforis/collect into UpdateBallon
SteRiccio Jan 18, 2023
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
9 changes: 6 additions & 3 deletions ...java/org/openforis/collect/io/metadata/collectearth/balloon/CEComponentHTMLFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,16 +276,19 @@ private XMLBuilder createBuilder(CEField comp, boolean includeLabel, XMLBuilder
case TIME:
XMLBuilder groupContainerBuilder = formControlContainer
.e("div") //$NON-NLS-1$
.a("class", "input-group date " + (((CEField) comp).getType() == CEFieldType.DATE ? "datepicker" : "timepicker")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
.a("class", "input-group date " + (((CEField) comp).getType() == CEFieldType.DATE ? "datepicker" : "timepicker")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
.a("id", elId + "timepicker"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
XMLBuilder inputFieldBuilder = groupContainerBuilder
.e("input") //$NON-NLS-1$
.a("id", elId) //$NON-NLS-1$
.a("name", elId) //$NON-NLS-1$
.a("class", "form-control"); //$NON-NLS-1$ //$NON-NLS-2$
groupContainerBuilder.e("span") //$NON-NLS-1$
.a("class", "input-group-addon") //$NON-NLS-1$ //$NON-NLS-2$
.a("class", "input-group-text") //$NON-NLS-1$ //$NON-NLS-2$
.a("data-td-target", "#" + elId + "timepicker") //$NON-NLS-1$ //$NON-NLS-2$

.e("span") //$NON-NLS-1$
.a("class", "glyphicon glyphicon-time") //$NON-NLS-1$ //$NON-NLS-2$
.a("class", ((CEField) comp).getType() == CEFieldType.DATE ? "fas fa-calendar" : "fas fa-clock" ) //$NON-NLS-1$ //$NON-NLS-2$
;
if (comp.isReadOnly()) {
inputFieldBuilder.a("disabled", "disabled");
Expand Down
19 changes: 12 additions & 7 deletions .../resources/org/openforis/collect/designer/templates/collectearth/balloon_template_new.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,21 @@

</script>

<script src="earthFiles/datepicker/popper.js?v=$[randomNumber]"></script>

<script src="earthFiles/jquery/jquery.js?v=$[randomNumber]"></script>
<script src="earthFiles/jquery/jquery-ui.js?v=$[randomNumber]"></script>
<script src="earthFiles/jquery/jquery.blockUI.js?v=$[randomNumber]"></script>
<script src="earthFiles/jquery/jquery.selectBoxIt.min.js?v=$[randomNumber]"></script>
<script src="earthFiles/jquery/jquery.blockUI.js?v=46044548"></script>
<script src="earthFiles/jquery/jquery.steps.openforis.js?v=$[randomNumber]"></script>
<script src="earthFiles/bootstrap/bootstrap.min.js?v=$[randomNumber]"></script>
<script src="earthFiles/bootstrap/moment.js?v=$[randomNumber]"></script>
<script src="earthFiles/bootstrap/bootstrap-datetimepicker.min.js?v=$[randomNumber]"></script>
<script src="earthFiles/bootstrap/bootstrap.bundle.js?v=$[randomNumber]"></script>


<!-- Files for the Date/Time picker -->
<script src="earthFiles/datepicker/solid.js?v=$[randomNumber]"></script>
<script src="earthFiles/datepicker/fontawesome.js?v=$[randomNumber]"></script>
<script src="earthFiles/datepicker/tempus-dominus.js?v=$[randomNumber]"></script>
<script src="earthFiles/datepicker/jQuery-provider.js?v=$[randomNumber]"></script>
<link rel="stylesheet" href="earthFiles/datepicker/tempus-dominus.css?v=$[randomNumber]"/>

<script src="earthFiles/openforis/of.js?v=$[randomNumber]"></script>
<script src="earthFiles/openforis/of-arrays.js?v=$[randomNumber]"></script>
Expand All @@ -94,10 +101,8 @@
<script src="earthFiles/js/earth_new.js?v=$[randomNumber]"></script>

<link href="earthFiles/jquery/jquery-ui.css?v=$[randomNumber]" rel="stylesheet" />
<link href="earthFiles/jquery/jquery.selectBoxIt.css?v=$[randomNumber]" rel="stylesheet" />
<link href="earthFiles/jquery/jquery-steps.css?v=$[randomNumber]" rel="stylesheet" />
<link href="earthFiles/bootstrap/bootstrap.css?v=$[randomNumber]" rel="stylesheet" />
<link href="earthFiles/bootstrap/bootstrap-datetimepicker.min.css?v=$[randomNumber]" rel="stylesheet" />

<link href="earthFiles/css/earth.css?v=$[randomNumber]" rel="stylesheet" />
<!--
Expand Down
5 changes: 0 additions & 5 deletions ...ect/designer/templates/collectearth/earthFiles/bootstrap/bootstrap-datetimepicker.min.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...lect/designer/templates/collectearth/earthFiles/bootstrap/bootstrap-datetimepicker.min.js
View file
Open in desktop

This file was deleted.

Loading