wip

sequentech · Jul 3, 2023 · 0f56351 · 0f56351
1 parent 8d3df8e
commit 0f56351
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/avBooth/2questions-conditional-screen-directive/2questions-conditional-screen-directive.html b/avBooth/2questions-conditional-screen-directive/2questions-conditional-screen-directive.html
@@ -5,7 +5,7 @@
   <div class="navbar-unfixed-top text-center">
     <div class="container">
       <div class="hidden unfixed-top-height"></div>
-      <h1 ng-bind-html="election.presentation.extra_options.public_title || election.title">
+      <h1 ng-bind-html="(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title')">
       </h1>
       <p class="description" ng-bind-html="election.description | addTargetBlank"></p>
     </div>

diff --git a/avBooth/help-screen-directive/help-screen-directive.html b/avBooth/help-screen-directive/help-screen-directive.html
@@ -6,7 +6,7 @@
   <div class="navbar-unfixed-top text-center">
     <div class="container">
       <div class="hidden unfixed-top-height"></div>
-      <h1 ng-bind-html="election.presentation.extra_options.public_title || election.title">
+      <h1 ng-bind-html="(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title')">
       </h1>
       <p class="description" ng-bind-html="election.description | addTargetBlank"></p>
     </div>

diff --git a/avBooth/pairwise-beta-directive/pairwise-beta-directive.html b/avBooth/pairwise-beta-directive/pairwise-beta-directive.html
@@ -26,7 +26,7 @@
         class="col-md-7 text-center center-col"
       >
         <div class="top-navbar-title">
-          {{election.presentation.extra_options.public_title || election.title}}
+          {{(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title')}}
         </div>
 
         <div

diff --git a/avBooth/show-pdf-directive/show-pdf-directive.html b/avBooth/show-pdf-directive/show-pdf-directive.html
@@ -7,7 +7,13 @@
       <div class="hidden unfixed-top-height"></div>
       <h1
         class="election-title"
-        ng-bind-html="parentElection && (parentElection.presentation.extra_options.public_title || parentElection.title) || !parentElection && (election.presentation.extra_options.public_title || election.title) || ''"
+        ng-if="parentElection"
+        ng-bind-html="(parentElection.presentation | customI18n : 'public_title') || (parentElection | customI18n : 'title') || ''"
+      ></h1>
+      <h1
+        class="election-title"
+        ng-if="!parentElection"
+        ng-bind-html="(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title') || ''"
       ></h1>
       <p
         class="pdf-text-description description" 

diff --git a/avBooth/simultaneous-questions-screen-directive/simultaneous-questions-screen-directive.html b/avBooth/simultaneous-questions-screen-directive/simultaneous-questions-screen-directive.html
@@ -6,7 +6,7 @@
     <div class="col-xs-12 text-center">
       <h1
         class="election-title"
-        ng-bind-html="election.presentation.extra_options.public_title || election.title"
+        ng-bind-html="(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title')"
       ></h1>
       <p
         ng-if="election.description"

diff --git a/...imultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.html b/...imultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.html
@@ -28,7 +28,7 @@
   <h1 class="election-header">
     <span
       class="election-title"
-      ng-bind-html="election.presentation.extra_options.public_title || election.title"
+      ng-bind-html="(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title')"
     ></span>
     <i class="pull-right fa fa-lg fa-question-circle" ng-click="showHelp()"></i>
   </h1>

diff --git a/avBooth/start-screen-directive/start-screen-directive.html b/avBooth/start-screen-directive/start-screen-directive.html
@@ -14,16 +14,16 @@
         <h1
           class="election-title"
           ng-if="parentElection"
-          ng-bind-html="(parentElection.presentation.extra_options  | customI18n : 'public_title') || (parentElection | customI18n : 'title') || ''"
+          ng-bind-html="(parentElection.presentation | customI18n : 'public_title') || (parentElection | customI18n : 'title') || ''"
         ></h1>
         <h1
           class="election-title"
           ng-if="!parentElection"
-          ng-bind-html="(election.presentation.extra_options | customI18n : 'public_title') || (election | customI18n : 'title') || ''"
+          ng-bind-html="(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title') || ''"
         ></h1>
         <p
           class="election-description description"
-          ng-bind-html="(parentElection  | customI18n : 'description') | addTargetBlank"
+          ng-bind-html="(parentElection | customI18n : 'description') | addTargetBlank"
           ng-if="parentElection && (!!parentElection.description || !!parentElection.description_i18n)"
         ></p>
         <p