diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
index 7c13f5cb..925aa4a9 100755
--- a/app/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -49,7 +49,7 @@
@grey_darker_colour: #515151;
@background_lighter_colour: #f9f9f9;
@background_darker_colour: #d1d5d4;
-@green_colour: #346536;
+@green_colour: #346536;
@red_colour: #ec563c;
@red_lighter_colour: #EE6B54;
@white_colour: #ffffff;
@@ -723,7 +723,7 @@ table.dmp_table tbody td.dmp_td_border{
table.dmp_table tbody td.dmp_border_bottom{
border-bottom: 1px solid @grey_very_light_colour;
padding: 0px 0px 0px 5px;
-
+
}
table.dmp_table a.dmp_table_link, table.dmp_table a.dmp_table_link:active, table.dmp_table a.dmp_table_link:visited{
text-decoration: none !important;
@@ -756,7 +756,7 @@ table.dmp_table a.dmp_table_link:hover{
padding: 20px 20px 20px 20px;
}
-/* removed hidding this dropdowns as we
+/* removed hidding this dropdowns as we
temporarily removed funder dropdown. Wshi - Feb 09, 2015
#institution-control-group{
display:none;
@@ -1399,7 +1399,7 @@ ul.question_right_column_ul li.active a:focus {
border-bottom-color: transparent;
border-bottom-left-radius:0px;
border-bottom-right-radius:0px;
-
+
}
/* being used in the accordion on the question right column */
@@ -1419,10 +1419,10 @@ p.accordion_label{
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
- border-top-left-radius:0px;
+ border-top-left-radius:0px;
padding: 10px 10px 5px 10px;
margin-top: 0px;
-}
+}
@@ -1623,7 +1623,7 @@ ul.help_ul li{
text-align: right;
border-spacing: 2px;
vertical-align: center;
-
+
form#filter_form {
background-color: @white_colour;
@@ -1659,7 +1659,7 @@ ul.help_ul li{
&:hover{
color: @white_colour !important;
-
+
}
}
diff --git a/app/views/layouts/_dmponline_footer.html.erb b/app/views/layouts/_dmponline_footer.html.erb
index 04c3bb9e..6f27dfbd 100755
--- a/app/views/layouts/_dmponline_footer.html.erb
+++ b/app/views/layouts/_dmponline_footer.html.erb
@@ -13,7 +13,8 @@
diff --git a/app/views/layouts/_dmponline_header.html.erb b/app/views/layouts/_dmponline_header.html.erb
index 23adb040..2a0c2c2b 100755
--- a/app/views/layouts/_dmponline_header.html.erb
+++ b/app/views/layouts/_dmponline_header.html.erb
@@ -91,7 +91,7 @@
<%= link_to t('helpers.help_label'), help_path, :class => "btn header_button btn-primary"%>
- <%= link_to t('helpers.terms_label'), t('terms_url'), :class => "btn header_button btn-primary"%>
+ <%= link_to t('helpers.terms_label'), t('helpers.terms_url'), :class => "btn header_button btn-primary"%>
<%end%>
diff --git a/app/views/layouts/_dmponline_header_ua.html.erb b/app/views/layouts/_dmponline_header_ua.html.erb
index cca8b469..80c844a7 100755
--- a/app/views/layouts/_dmponline_header_ua.html.erb
+++ b/app/views/layouts/_dmponline_header_ua.html.erb
@@ -84,7 +84,7 @@
<%= link_to t('helpers.about_us_label'), about_us_path, :class => "btn header_button btn-primary"%>
- <%= link_to t('helpers.terms_label'), t('terms_url'), :class => "btn header_button btn-primary"%>
+ <%= link_to t('helpers.terms_label'), t('helpers.terms_url'), :class => "btn header_button btn-primary"%>
<%end%>
diff --git a/app/views/layouts/_dmponline_header_ubc.html.erb b/app/views/layouts/_dmponline_header_ubc.html.erb
index 6b6a402c..809482ed 100755
--- a/app/views/layouts/_dmponline_header_ubc.html.erb
+++ b/app/views/layouts/_dmponline_header_ubc.html.erb
@@ -86,7 +86,7 @@
<%= link_to t('helpers.help_label'), help_path, :class => "btn header_button btn-primary"%>
- <%= link_to t('helpers.terms_label'), t('terms_url'), :class => "btn header_button btn-primary"%>
+ <%= link_to t('helpers.terms_label'), t('helpers.terms_url'), :class => "btn header_button btn-primary"%>
<%end%>
diff --git a/app/views/shared/_register_form.html.erb b/app/views/shared/_register_form.html.erb
index e17a7455..736dac40 100755
--- a/app/views/shared/_register_form.html.erb
+++ b/app/views/shared/_register_form.html.erb
@@ -45,7 +45,7 @@
<%= f.check_box :accept_terms, :required => true %> <%= f.label :accept_terms, :class => "remember_div" do %>
- <%= raw t('helpers.accept_terms_html', terms_url: t('terms_url'))%>
+ <%= raw t('helpers.accept_terms_html', terms_url: t('helpers.terms_url'))%>
<%end%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9643d7f4..386b376f 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,5 +1,4 @@
en:
- terms_url: 'https://portagenetwork.ca/portage-dmp-assistant-terms-use/'
date:
formats:
# Use the strftime parameters for formats.
@@ -299,6 +298,8 @@ en:
help_label: "Help"
contact_label: "Contact"
terms_label: "Terms of Use"
+ terms_url: 'https://portagenetwork.ca/portage-dmp-assistant-terms-use/'
+ web_privacy_label: "Web Site Privacy Policy"
jisc: "The DCC is funded by"
greeting: "Hello"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 21ce2f98..afed8580 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1,5 +1,4 @@
fr:
- terms_url: 'https://portagenetwork.ca/fr/conditions-dutilisation-de-lassistant-pgd-de-portage/'
date:
formats:
# Use the strftime parameters for formats.
@@ -285,6 +284,8 @@ fr:
help_label: "Aide"
contact_label: "Contact"
terms_label: "Conditions D'utilisation"
+ terms_url: 'https://portagenetwork.ca/fr/conditions-dutilisation-de-lassistant-pgd-de-portage/'
+ web_privacy_label: "Politique de confidentialité du site Web (en anglais)"
jisc: "Le DCC est financé par"
greeting: "Bonjour"