Merge branch 'dev' of https://github.com/Beit-Hatfutsot/dbs-front int…

…o Update-text-in-About-Family-Names-page-Beit-Hatfutsot#324
Libisch · Mar 22, 2017 · b325492 · b325492
2 parents 1506b65 + a14a6c5
commit b325492
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/js/modules/main/src/controllers/personViewController.js b/js/modules/main/src/controllers/personViewController.js
@@ -98,16 +98,6 @@ PersonViewController.prototype = {
 		}
 	},
 
-	get_fname: function(d) {
-		try {
-			return d.name[0];
-		}
-		catch (e) {
-			// something's wrong so we return a smile
-			return "\u263a";
-		}
-	},
-
   clear: function () {
     this.elements = {};
     this.vertices = {};
@@ -379,9 +369,7 @@ PersonViewController.prototype = {
 			    .classed('name', true)
 				  .classed('noselect', true)
 				  .text(function(d) {
-					return ['individual', 'partner', 'parent']
-						   .indexOf(d.class) >= 0 ? self.get_full_name(d):
-													self.get_fname(d)
+					return self.get_full_name(d);
 					});
 
 

diff --git a/scss/main/_ftree-item.scss b/scss/main/_ftree-item.scss
@@ -62,7 +62,7 @@
       	.name {
             font-size: 12px;
             overflow: hidden;
-            @include vertical-align()
+            @include vertical-align();
 		}
     }
 
@@ -76,6 +76,10 @@
                 height:16px;
             }
 		}
+      .name {
+        line-height: 1em;
+        height: 1em;
+      }
 
     }
     .node[role="grandparent"], .node[role="sibling"] {

diff --git a/scss/main/_item.scss b/scss/main/_item.scss
@@ -778,7 +778,12 @@
                 }
 
               p.vertical-middle {
-                margin-left: 2em;
+                .he & {
+                  margin-right: 2em;
+                }
+                .en & {
+                  margin-left: 2em;
+                }
               }
 
                 &:hover {

diff --git a/templates/main/ftrees/persons.html b/templates/main/ftrees/persons.html
@@ -24,7 +24,7 @@ <h3 class="title__text">
                   label-text-en="Family Name"
                               label-text-he="שם משפחה"
                               model="last_name"
-                              placeholder="{{(lang=='en')?'Cohen, Kafka...':'כהן, קפקא...'}}">
+                              placeholder="{{(lang=='en')?'Cohen, Kafka...':'כהן, אינשטיין...'}}">
                     </filters-field>
                 <ng-switch on="ctrl.$stateParams.more">
                   <div ng-switch-when="1" class="filters__sex" >