fix titles + add google map embed

Beit-Hatfutsot · Jul 12, 2017 · c4c1267 · c4c1267
1 parent 6dee824
commit c4c1267
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 46 deletions.
diff --git a/js/modules/main/src/_init/_init.js b/js/modules/main/src/_init/_init.js
@@ -363,7 +363,8 @@ function($urlRouterProvider, $stateProvider, $locationProvider, $httpProvider, $
 
     $sceDelegateProvider.resourceUrlWhitelist([
         'self',
-        new RegExp('^http[s]?:\/\/storage.googleapis.com\/bhs.*\.mp4$')
+        new RegExp('^http[s]?:\/\/storage.googleapis.com\/bhs.*\.mp4$'),
+        new RegExp('^http[s]?:\/\/www.google.com\/.*$')
     ]);
 
 	markedProvider.setOptions({ breaks: true })

diff --git a/templates/item/movies.html b/templates/item/movies.html
@@ -8,18 +8,18 @@
                 <div class="item__header">
                    <div class="text">
                         <en>
-                            <span ng-if="(itemController.search_result.place.Header.En || itemController.search_result.name.Header.En) == itemController.item_data.Header.En">
-                                Your Search Result for {{itemController.item_data.Header.En}}:
+                            <span ng-if="(itemController.search_result.place.title_en || itemController.search_result.name.title_en) == itemController.item_data.title_en">
+                                Your Search Result for {{itemController.item_data.title_en}}:
                             </span>
-                            <span ng-if="(itemController.search_result.place.Header.En || itemController.search_result.name.Header.En) !== itemController.item_data.Header.En">
+                            <span ng-if="(itemController.search_result.place.title_en || itemController.search_result.name.title_en) !== itemController.item_data.title_en">
                                 Your Selected Item:
                             </span>
                         </en>
                         <he>
-                            <span ng-if="(itemController.search_result.place.Header.He || itemController.search_result.name.Header.He) == itemController.item_data.Header.He">
-                                תוצאות חיפוש עבור {{itemController.item_data.Header.He}}:
+                            <span ng-if="(itemController.search_result.place.title_he || itemController.search_result.name.title_he) == itemController.item_data.title_he">
+                                תוצאות חיפוש עבור {{itemController.item_data.title_he}}:
                             </span>
-                            <span ng-if="(itemController.search_result.place.Header.He || itemController.search_result.name.Header.He) !== itemController.item_data.Header.He">
+                            <span ng-if="(itemController.search_result.place.title_he || itemController.search_result.name.title_he) !== itemController.item_data.title_he">
                                 הערך הנבחר:
                             <span>
                         </he>
@@ -70,14 +70,14 @@
                             <item-type type="itemController.item_type"
                               image="itemController.item_data.thumbnail_url"></item-type>
                             <h1 class="item__article-header">
-                                <en><span>{{itemController.item_data.Header.En}}</span></en>
-                                <he><span>{{itemController.item_data.Header.He}}</span></he>
+                                <en><span>{{itemController.item_data.title_en}}</span></en>
+                                <he><span>{{itemController.item_data.title_he}}</span></he>
                             </h1>
                         </div>
                         <div class="gallery-modal__info">
                             <div class="gallery-modal__info__picture-info">
-                                <en><span class="field-name">Title: </span>{{itemController.item_data.Header.En}}</en><br/>
-                                <he><span class="field-name">כותרת: </span>{{itemController.item_data.Header.He}}</he>
+                                <en><span class="field-name">Title: </span>{{itemController.item_data.title_en}}</en><br/>
+                                <he><span class="field-name">כותרת: </span>{{itemController.item_data.title_he}}</he>
                                 <en><span class="field-name">In this film: </span>{{itemController.item_data.UnitText1.En}}</en><br/>
                                 <he><span class="field-name">מה בסרט: </span>{{itemController.item_data.UnitText1.He}}</he>
                                 <en><span class="field-name">Film Length: </span>{{itemController.item_data.Minutes}}</en><br/>

diff --git a/templates/item/photoUnits.html b/templates/item/photoUnits.html
@@ -8,18 +8,18 @@
                 <div class="item__header">
                     <div class="text">
                         <en>
-                            <span ng-if="(itemController.search_result.place.Header.En || itemController.search_result.name.Header.En) == itemController.item_data.Header.En">
-                                Your Search Result for {{itemController.item_data.Header.En}}:
+                            <span ng-if="(itemController.search_result.place.title_en || itemController.search_result.name.title_en) == itemController.item_data.title_en">
+                                Your Search Result for {{itemController.item_data.title_en}}:
                             </span>
-                            <span ng-if="(itemController.search_result.place.Header.En || itemController.search_result.name.Header.En) !== itemController.item_data.Header.En">
+                            <span ng-if="(itemController.search_result.place.title_en || itemController.search_result.name.title_en) !== itemController.item_data.title_en">
                                 Your Selected Item:
                             </span>
                         </en>
                         <he>
-                            <span ng-if="(itemController.search_result.place.Header.He || itemController.search_result.name.Header.He) == itemController.item_data.Header.He">
-                                תוצאות חיפוש עבור {{itemController.item_data.Header.He}}:
+                            <span ng-if="(itemController.search_result.place.title_he || itemController.search_result.name.title_he) == itemController.item_data.title_he">
+                                תוצאות חיפוש עבור {{itemController.item_data.title_he}}:
                             </span>
-                            <span ng-if="(itemController.search_result.place.Header.He || itemController.search_result.name.Header.He) !== itemController.item_data.Header.He">
+                            <span ng-if="(itemController.search_result.place.title_he || itemController.search_result.name.title_he) !== itemController.item_data.title_he">
                                 הערך הנבחר:
                             <span>
                         </he>
@@ -92,8 +92,8 @@
                             <item-type type="itemController.item_type"
                               image="itemController.item_data.thumbnail_url"></item-type>
                             <h1 class="item__article-header">
-                                <en>{{itemController.item_data.Header.En}}</en>
-                                <he>{{itemController.item_data.Header.He}}</he>
+                                <en>{{itemController.item_data.title_en}}</en>
+                                <he>{{itemController.item_data.title_he}}</he>
                             </h1>
                         </div>
                         <div class="gallery-modal__info">
@@ -116,8 +116,8 @@ <h1 class="item__article-header">
                             </div>
                             <div class="gallery-modal__info__gallery-preview">
                                 <div class="gallery-modal__info__gallery-preview__title">
-                                    <en>{{itemController.item_data.Header.En}} Pictures ({{itemController.item_data.Pictures.length}} found)</en>
-                                    <he>{{itemController.item_data.Header.He}} Pictures ({{itemController.item_data.Pictures.length}} found)</he>
+                                    <en>{{itemController.item_data.title_en}} Pictures ({{itemController.item_data.Pictures.length}} found)</en>
+                                    <he>{{itemController.item_data.title_he}} Pictures ({{itemController.item_data.Pictures.length}} found)</he>
                                 </div>
                                  <ul class="gallery-modal__info__gallery-preview__minified-picture">
                                     <li ng-repeat="pic in itemController.sort_pictures()" ng-class="{'active':itemController.isActive($index)}" ng-hide="isHidden($index)">

diff --git a/templates/item/right_side.html b/templates/item/right_side.html
@@ -5,39 +5,43 @@
     </div>
     <div class="search-results__field" ng-if="itemController.search_result.name.isNotEmpty()" ng-click="itemController.goto_item(itemController.search_result.name)">
       <p class="vertical-middle">
-            <en>{{itemController.search_result.name.Header.En}}</en>
-            <he>{{itemController.search_result.name.Header.He}}</he>
+            <en>{{itemController.search_result.name.title_en}}</en>
+            <he>{{itemController.search_result.name.title_he}}</he>
         </p>
       <item-type type="'familyNames'"></item-type>
     </div>
     <div class="search-results__field" ng-if="itemController.search_result.place.isNotEmpty()" ng-click="itemController.goto_item(itemController.search_result.place)">
         <p class="vertical-middle">
-            <en>{{itemController.search_result.place.Header.En}}</en>
-            <he>{{itemController.search_result.place.Header.He}}</he>
+            <en>{{itemController.search_result.place.title_en}}</en>
+            <he>{{itemController.search_result.place.title_he}}</he>
         </p>
         <item-type type="'places'"></item-type>
     </div>
     <div class="search-results__field"
          ng-click="itemController.goto_persons()">
         <p class="vertical-middle">
             <span ng-if="itemController.search_result.name.Header">
-                <en>{{itemController.search_result.name.Header.En}}</en>
-                <he>{{itemController.search_result.name.Header.He}}</he>
+                <en>{{itemController.search_result.name.title_en}}</en>
+                <he>{{itemController.search_result.name.title_he}}</he>
             </span>
             <span ng-if="!itemController.search_result.name.Header && itemController.search_result.place.Header">
-                <en>{{itemController.search_result.place.Header.En}}</en>
-                <he>{{itemController.search_result.place.Header.He}}</he>
+                <en>{{itemController.search_result.place.title_en}}</en>
+                <he>{{itemController.search_result.place.title_he}}</he>
             </span>
         </p>
         <item-type type="'genTreeIndividuals'"></item-type>
     </div>
 </div>
-<div class="map" ng-show="itemController.item_data.UnitType == '5' && itemController.item_data.geometry">
+<div class="map" ng-show="itemController.item_data.google_map_embed">
   <div class="map__header">
-    <en>Nearby Places:</en>
-    <he>מקומות בסביבה:</he>
+    <en>Map:</en>
+    <he>מפה:</he>
   </div>
-  <leaflet preview-data="itemController.item_data" id="mapid"></leaflet>
+  <p><iframe allowfullscreen=""
+             frameborder="0"
+             height="300"
+             ng-src="{{itemController.item_data.google_map_embed}}"
+             style="border:0"></iframe></p>
 </div>
 
 <div class="search-results">
@@ -48,8 +52,8 @@
     <div class="search-results__field search"
           ui-sref="general-search({q: itemController.item_data.Header.{{itemController.proper_lang}}})">
       <p class="vertical-middle" ng-attr-title="{{itemController.item_data.Header[itemController.proper_lang]}}">
-            <en>{{itemController.item_data.Header.En}}</en>
-            <he>{{itemController.item_data.Header.He}}</he>
+            <en>{{itemController.item_data.title_en}}</en>
+            <he>{{itemController.item_data.title_he}}</he>
       </p>
       <div class="item-type">
         <div class="search-icon">

diff --git a/templates/item/text_item.html b/templates/item/text_item.html
@@ -12,10 +12,10 @@
                             Your Search Result for {{itemController.item_data.title_en}}:
                           </span>
                           <!-- TODO: figure out why this logic is needed -->
-                                        <!--<span ng-if="(itemController.search_result.place.Header.En || itemController.search_result.name.Header.En) == itemController.item_data.title_en">-->
+                                        <!--<span ng-if="(itemController.search_result.place.title_en || itemController.search_result.name.title_en) == itemController.item_data.title_en">-->
                   <!--Your Search Result for {{itemController.item_data.title_en}}:-->
               <!--</span>-->
-                            <!--<span ng-if="(itemController.search_result.place.Header.En || itemController.search_result.name.Header.En) !== itemController.item_data.Header.En">-->
+                            <!--<span ng-if="(itemController.search_result.place.title_en || itemController.search_result.name.title_en) !== itemController.item_data.title_en">-->
                   <!--Your Selected Item:-->
               <!--</span>-->
                         </en>
@@ -24,10 +24,10 @@
                                         תוצאות חיפוש עבור {{itemController.item_data.title_he}}:
                           </span>
                           <!-- TODO: figure out why this logic is needed -->
-                            <!--<span ng-if="(itemController.search_result.place.Header.He || itemController.search_result.name.Header.He) == itemController.item_data.Header.He">-->
-                  <!--תוצאות חיפוש עבור {{itemController.item_data.Header.He}}:-->
+                            <!--<span ng-if="(itemController.search_result.place.title_he || itemController.search_result.name.title_he) == itemController.item_data.title_he">-->
+                  <!--תוצאות חיפוש עבור {{itemController.item_data.title_he}}:-->
               <!--</span>-->
-                            <!--<span ng-if="(itemController.search_result.place.Header.He || itemController.search_result.name.Header.He) !== itemController.item_data.Header.He">-->
+                            <!--<span ng-if="(itemController.search_result.place.title_he || itemController.search_result.name.title_he) !== itemController.item_data.title_he">-->
                   <!--הערך הנבחר:-->
               <!--<span>-->
             </he>
@@ -105,8 +105,8 @@
                 <div class="header-wrapper">
                     <item-type type="itemController.item_type"></item-type>
                     <h1 class="item__article-header">
-                        <en>{{itemController.item_data.Header.En}}</en>
-                        <he>{{itemController.item_data.Header.He}}</he>
+                        <en>{{itemController.item_data.title_en}}</en>
+                        <he>{{itemController.item_data.title_he}}</he>
                     </h1>
                 </div>
 

diff --git a/templates/main/gallery-modal.html b/templates/main/gallery-modal.html
@@ -1,7 +1,7 @@
 <div id="printSection" class='gallery-modal'>
     <div class="gallery-modal__header">
-       <en>{{gallery.Header.En}}</en>
-       <he>{{gallery.Header.He}}</he>
+       <en>{{gallery.title_en}}</en>
+       <he>{{gallery.title_he}}</he>
        <icon class="xsign" position="[-224, -333]" ng-click="dismiss()"></icon>
     </div>
     <div class="gallery-modal__stage noselect">
@@ -47,8 +47,8 @@
         </div>
         <div class="gallery-modal__info__gallery-preview">
             <div class="gallery-modal__info__gallery-preview__title">
-                <en>{{gallery.Header.En}} ({{gallery.Pictures.length}} Pictures found)</en>
-                <he>{{gallery.Header.He}} ({{gallery.Pictures.length}} תמונות נמצאו)</he>
+                <en>{{gallery.title_en}} ({{gallery.Pictures.length}} Pictures found)</en>
+                <he>{{gallery.title_he}} ({{gallery.Pictures.length}} תמונות נמצאו)</he>
             </div>
             <ul class="gallery-modal__info__gallery-preview__minified-picture">
                 <li ng-repeat="pic in sort_pictures()" ng-class="{'active':isActive($index)}">