Skip to content

Commit

Permalink
Start update to survey status details
Browse files Browse the repository at this point in the history
  • Loading branch information
dwuthrich committed Jan 28, 2019
1 parent bd5dfec commit 8500b1f
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
24 changes: 21 additions & 3 deletions arches/app/media/css/arches.css
Original file line number Diff line number Diff line change
Expand Up @@ -10781,7 +10781,7 @@ a.search-facet-item.disabled {
.mpm-card-content {
margin: 0px;
border-bottom: 1px solid #ddd;
padding: 40px 25px 50px 25px;
padding: 50px 25px 50px 25px;
background: #f9f9f9;
}

Expand All @@ -10795,7 +10795,13 @@ a.search-facet-item.disabled {
}

.mpm-card-content.active-survey {
background: #f3f3f3;
background: #C1F8E9;
border-top: 1px solid #65D6B7;
border-bottom: 1px solid #65D6B7;
}

.active-survey .msm-survey-message {
color: #009E72;
}

.msm-summary-panel .selection-page {
Expand Down Expand Up @@ -11806,14 +11812,26 @@ a.filter-tools:hover {
text-align: center;
}

.msm-survey-requirements-text {
margin-top: 20px;
}

.msm-survey-status-text {
margin-top: 0px;
}

.msm-survey-message {
margin-top: 20px;
font-size: 16px;
color: #888;
}

.msm-survey-status-instructions {
padding: 20px 10px 5px 10px;
font-size: 19px;
font-size: 16px;
text-align: center;
border: 1px solid #ddd;
background: orange;
}

.msm-survey-issues {
Expand Down
12 changes: 9 additions & 3 deletions arches/app/templates/views/mobile-survey-designer.htm
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,18 @@ <h1 class="page-header text-overflow mobile-designer-title">
<!-- Icon and Status warning -->
<div class="mpm-survey-status-header">
<i class="msm-icon-wrap fa fa-check" style="color:#333; background: #eee; border: 1px solid #333; padding-right:5px;"></i>
<div class="msm-survey-status-text">{% trans 'Survey Requirements: Complete' %}</div>
<div class="msm-survey-requirements-text">
{% trans 'Survey Requirements: Complete' %}
</div>
<div class="msm-survey-status-text" data-bind="text: mobilesurvey.activatedOnServer() === true ? '{% trans "Survey Status: Active" %}' : '{% trans " Survey Status: Inactive" %}'"></div>

<div class="msm-survey-message">
This survey is now active! <br> Mobile app users can download this survey and begin <br> collecting and editing data using their mobile device.
</div>
</div>

<!--ko if: mobilesurvey.activatedOnServer() === false && mobilesurvey.active() === true -->
<div class="msm-survey-status-instructions">{% trans 'You are activating this survey. Users will be able to download this survey and begin collecting data.' %}</div>
<div class="msm-survey-status-instructions">{% trans "You are activating this survey. Confirm your settings before you save: you won't be able <br> to change the models, cards, or groups after you save your survey" %}</div>
<!--/ko-->

<!--ko if: mobilesurvey.activatedOnServer() === true && mobilesurvey.active() === false -->
Expand All @@ -109,7 +115,7 @@ <h1 class="page-header text-overflow mobile-designer-title">
<!-- Icon and Status warning -->
<div class="mpm-survey-status-header">
<i class="msm-icon-wrap fa fa-exclamation-triangle" style="color:orange; padding-right:5px;"></i>
<div class="msm-survey-status-text">{% trans 'Survey Requirements: Incomplete' %}</div>
<div class="msm-survey-requirements-text">{% trans 'Survey Requirements: Incomplete' %}</div>
<div class="msm-survey-status-text" data-bind="text: mobilesurvey.activatedOnServer() === true ? '{% trans "Survey Status: Active" %}' : '{% trans " Survey Status: Inactive" %}'"></div>
</div>

Expand Down

0 comments on commit 8500b1f

Please sign in to comment.