From c484776117dbc7548274fd9f94fbefea9f24b11c Mon Sep 17 00:00:00 2001 From: juayuohcarineneng19 Date: Mon, 8 Jul 2024 13:22:38 +0200 Subject: [PATCH 1/5] instance row control btns --- app/config/assets/css/odk-survey.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/config/assets/css/odk-survey.css b/app/config/assets/css/odk-survey.css index 60a0cf3d2..2e604566d 100644 --- a/app/config/assets/css/odk-survey.css +++ b/app/config/assets/css/odk-survey.css @@ -241,7 +241,7 @@ input[type="range"]::-webkit-slider-thumb:before { /* The height is a trade-off, we get a better looking regular grid with it set, but we loose the ability auto-fit arbitrary sized content. - Maybe I could use a table to get the best of both worlds. + Maybe I could use a table to get the best of both worlds. */ width: 130px; margin: 2px; @@ -339,6 +339,8 @@ Eventually we should make a jqm theme for this. .instanceRowControl{ float: right; + display: flex; + margin-right: 10px; } .openingRowControl{ From 6236ea4b8f5cea91246607347704e0f82530cc26 Mon Sep 17 00:00:00 2001 From: juayuohcarineneng19 Date: Tue, 9 Jul 2024 15:05:37 +0200 Subject: [PATCH 2/5] add gap betwee buttons --- app/config/assets/css/odk-survey.css | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/assets/css/odk-survey.css b/app/config/assets/css/odk-survey.css index 2e604566d..76bb692af 100644 --- a/app/config/assets/css/odk-survey.css +++ b/app/config/assets/css/odk-survey.css @@ -341,6 +341,7 @@ Eventually we should make a jqm theme for this. float: right; display: flex; margin-right: 10px; + gap: 5px; } .openingRowControl{ From a91481c8127d2aec416767c531f316dd7b11a6cc Mon Sep 17 00:00:00 2001 From: juayuohcarineneng19 Date: Mon, 15 Jul 2024 11:24:05 +0200 Subject: [PATCH 3/5] border-radius added --- app/config/assets/css/odk-survey.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/config/assets/css/odk-survey.css b/app/config/assets/css/odk-survey.css index 76bb692af..dbefe1811 100644 --- a/app/config/assets/css/odk-survey.css +++ b/app/config/assets/css/odk-survey.css @@ -344,6 +344,20 @@ Eventually we should make a jqm theme for this. gap: 5px; } +.instanceRowControl .openInstance{ + border-top-left-radius: 8px!important; + border-top-right-radius: 8px!important; + border-bottom-right-radius: 8px!important; + border-bottom-left-radius: 8px!important; + } + +.instanceRowControl .deleteInstance { + border-top-left-radius: 8px!important; + border-top-right-radius: 8px!important; + border-bottom-right-radius: 8px!important; + border-bottom-left-radius: 8px!important; + } + .openingRowControl{ float: right; } From ad33d042a935c8f7c6febb69bd295fd6bbd99755 Mon Sep 17 00:00:00 2001 From: juayuohcarineneng19 Date: Mon, 15 Jul 2024 11:27:40 +0200 Subject: [PATCH 4/5] consistent border and equal spacing --- app/config/assets/css/odk-survey.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/assets/css/odk-survey.css b/app/config/assets/css/odk-survey.css index dbefe1811..2a1eb505f 100644 --- a/app/config/assets/css/odk-survey.css +++ b/app/config/assets/css/odk-survey.css @@ -340,7 +340,7 @@ Eventually we should make a jqm theme for this. .instanceRowControl{ float: right; display: flex; - margin-right: 10px; + margin-right: auto; gap: 5px; } From 70f76263dd4cb61b9da688b8d2f1860fc5328535 Mon Sep 17 00:00:00 2001 From: juayuohcarineneng19 Date: Tue, 20 Aug 2024 17:02:44 +0200 Subject: [PATCH 5/5] add material design icons --- app/config/assets/css/odk-survey.css | 10 +- app/system/index.html | 76 +++++------ .../survey/templates/instances.handlebars | 124 +++++++++--------- 3 files changed, 110 insertions(+), 100 deletions(-) diff --git a/app/config/assets/css/odk-survey.css b/app/config/assets/css/odk-survey.css index 2a1eb505f..a8016c704 100644 --- a/app/config/assets/css/odk-survey.css +++ b/app/config/assets/css/odk-survey.css @@ -344,11 +344,15 @@ Eventually we should make a jqm theme for this. gap: 5px; } -.instanceRowControl .openInstance{ +.instanceRowControl .openInstance { border-top-left-radius: 8px!important; border-top-right-radius: 8px!important; border-bottom-right-radius: 8px!important; border-bottom-left-radius: 8px!important; + display: flex; + justify-content: center; + align-items: center; + text-align: center } .instanceRowControl .deleteInstance { @@ -356,6 +360,10 @@ Eventually we should make a jqm theme for this. border-top-right-radius: 8px!important; border-bottom-right-radius: 8px!important; border-bottom-left-radius: 8px!important; + display: flex; + justify-content: center; + align-items: center; + text-align: center } .openingRowControl{ diff --git a/app/system/index.html b/app/system/index.html index f89b5ff6c..55d468850 100644 --- a/app/system/index.html +++ b/app/system/index.html @@ -1,37 +1,39 @@ - - - - - - - OpenDataKit Common Javascript Framework - - - - - - - - - - - - - - - - -
-
-
-
-
-
Please wait...
-
-
-
-
- - - - + + + + + + + OpenDataKit Common Javascript Framework + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
Please wait...
+
+
+
+
+ + + + diff --git a/app/system/survey/templates/instances.handlebars b/app/system/survey/templates/instances.handlebars index 1b70e08c3..36bfb59fd 100644 --- a/app/system/survey/templates/instances.handlebars +++ b/app/system/survey/templates/instances.handlebars @@ -1,62 +1,62 @@ -
-
-
-
-
- {{{localizeText display.instances_survey_form_identification}}} - -
-
-
-
-
- -
-
-
-
-
- - {{{localizeText display.instances_previously_created_instances_label}}} -
-
-
    - {{#each instances}} - {{#if dateDivider}} -
  • {{dateDivider}}
    • - {{/if}} -
  • -
    -
    -
    -

    {{display_field}}

    - {{{localizeText ../display.instances_last_save_date_label}}} -

    {{savepoint_timestamp}}

    -

    {{localizeText savepoint_type_text}}

    - {{#if is_checkpoint}} -

    - {{/if}} -
    -
    -
    - - {{#if show_delete}} - - {{/if}} -
    -
    -
    -
    -
    • - {{else}} -
  • {{localizeText display.instances_no_saved_instances_label}}
    • - {{/each}} -
-
-
+
+
+
+
+
+ {{{localizeText display.instances_survey_form_identification}}} + +
+
+
+
+
+ +
+
+
+
+
+ + {{{localizeText display.instances_previously_created_instances_label}}} +
+
+
    + {{#each instances}} + {{#if dateDivider}} +
  • {{dateDivider}}
    • + {{/if}} +
  • +
    +
    +
    +

    {{display_field}}

    + {{{localizeText ../display.instances_last_save_date_label}}} +

    {{savepoint_timestamp}}

    +

    {{localizeText savepoint_type_text}}

    + {{#if is_checkpoint}} +

    + {{/if}} +
    +
    +
    + + {{#if show_delete}} + + {{/if}} +
    +
    +
    +
    +
    • + {{else}} +
  • {{localizeText display.instances_no_saved_instances_label}}
    • + {{/each}} +
+
+