Skip to content

Adding in desktop survey info, first pass #144

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

Open
rjasmin-camsys wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding in desktop survey info, first pass #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions onebusaway-nyc-acta-webapp/src/main/webapp/css/screen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,11 @@
padding-bottom: 2px;
}

#survey {
padding-top: 1.0em;
padding-bottom: 1.0em;
}

.clear {
clear: both;
}
8 changes: 4 additions & 4 deletions ...yc-webapp/src/main/java/org/onebusaway/nyc/webapp/actions/OneBusAwayNYCActionSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,22 +113,22 @@ protected UserBean getCurrentUser() {

public String getSurveyText() {
return _configurationService.getConfigurationValueAsString(
"display.surveyTextMobile", "Take a brief survey to help us improve your ride");
"display.surveyText", "Take a brief survey to help us improve your ride");
}

public String getSurveyLinkText() {
return _configurationService.getConfigurationValueAsString(
"display.surveyLinkTextMobile", "mta.info/csurvey");
"display.surveyLinkText", "mta.info/csurvey");
}

public String getSurveyLinkUrl() {
return _configurationService.getConfigurationValueAsString(
"display.surveyLinkUrlMobile", "https://mta.info/csurvey");
"display.surveyLinkUrl", "https://mta.info/csurvey");
}

public Boolean getShowSurvey() {
return _configurationService.getConfigurationValueAsBoolean(
"display.showSurveyMobile", false);
"display.showSurvey", false);
}

}
10 changes: 10 additions & 0 deletions onebusaway-nyc-webapp/src/main/webapp/WEB-INF/content/index.jspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,16 @@

<!-- Include the Google ad -->
<c:import url="includes/ad.jspx" />

<s:if test="%{getShowSurvey() &amp;&amp; getSurveyText() != null &amp;&amp; !getSurveyText().isEmpty()
&amp;&amp; getSurveyLinkText() != null &amp;&amp; !getSurveyLinkText().isEmpty()
&amp;&amp; getSurveyLinkUrl() != null &amp;&amp; !getSurveyLinkUrl().isEmpty()}">
<div id="survey">
<p>
${surveyText} <a href="${surveyLinkUrl}">${surveyLinkText}</a>
</p>
</div>
</s:if>

<div id="psa_element">${psa}</div>
</div>
Expand Down