[mhk] r1073 committed - Views updated @mhk_families

[codesite...@google.com]

Revision: 1073
Author: tbc...@gmail.com
Date: Mon May 27 17:26:00 2013
Log: Views updated @mhk_families
http://code.google.com/p/mhk/source/detail?r=1073

Modified:
/branches/mhk_families/idb/etc/template/new/rperson_acts.vm
/branches/mhk_families/idb/etc/template/new/rperson_family.vm
/branches/mhk_families/idb/etc/template/new/rperson_identification.vm
/branches/mhk_families/idb/etc/template/new/rperson_related.vm

=======================================
--- /branches/mhk_families/idb/etc/template/new/rperson_acts.vm Mon Nov 29
10:12:47 2010
+++ /branches/mhk_families/idb/etc/template/new/rperson_acts.vm Mon May 27
17:26:00 2013
@@ -45,7 +45,7 @@
<li><span>$mhkStrings.getString('rperson.all.acts')</span></li>
<li><a
href="${uri}?dbname=$!dbname&action=exec&script=rperson_related.vm&rid=$Entity.id&name=$!Entity.description">$mhkStrings.getString('rperson.related')</a></li>
<li><a
href="${uri}?dbname=$!dbname&action=exec&script=rperson_identification.vm&rid=$Entity.id&name=$!Entity.description">$mhks.get('rperson.identification')</a></li>
- ##<li><a
href="${uri}?dbname=$db.dbname&action=exec&script=rperson_family.vm&rid=$Entity.id&name=$!Entity.description">Family</a></li>
+ <li><a
href="${uri}?dbname=$db.dbname&action=exec&script=rperson_family.vm&rid=$Entity.id&name=$!Entity.description">$mhks.get('rperson.family')</a></li>
</ul>
</div>

=======================================
--- /branches/mhk_families/idb/etc/template/new/rperson_family.vm Mon May
27 17:06:04 2013
+++ /branches/mhk_families/idb/etc/template/new/rperson_family.vm Mon May
27 17:26:00 2013
@@ -59,11 +59,11 @@
min_level=-max_level;
}

- alert(max_level);
+ ##alert(max_level);

#foreach($person in $pf)
if("${person.getLevel()}"==max_level){
- alert("ADD "+ "${person.getId()}");
+ ##alert("ADD "+ "${person.getId()}");
#if($person.getSex()=="M" || $person.getSex()=="m")
nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(192,219,243)'}, line: {color:'rgb(100,100,100)'} }});
#elseif($person.getSex()=="F" || $person.getSex()=="f")
@@ -77,10 +77,10 @@
#end

#foreach($person in $pf)
- alert("${person.getLevel()}"+">"+min_level+"
&& "+ "${person.getLevel()}"+"<"+max_level);
+ ##alert("${person.getLevel()}"+">"+min_level+"
&& "+ "${person.getLevel()}"+"<"+max_level);
if("${person.getLevel()}">min_level
&& "${person.getLevel()}"<=max_level){
if(!hash.hasOwnProperty("${person.getId()}")){
- alert("ADD2 "+ "${person.getId()}" + " LEVEL="+"${person.getLevel()}");
+ ##alert("ADD2 "+ "${person.getId()}" + "
LEVEL="+"${person.getLevel()}");
#if($person.getSex()=="M" || $person.getSex()=="m")
nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(192,219,243)'}, line: {color:'rgb(100,100,100)'} }});
#elseif($person.getSex()=="F" || $person.getSex()=="f")
@@ -97,7 +97,7 @@

#if($family.getChild()!="")
if(!hash.hasOwnProperty("${family.getChild()}")){
- alert("ADDC "+"${family.getChild()}");
+ ##alert("ADDC "+"${family.getChild()}");
#if($family.getFather()!="" && $family.getMother()!="")
nodes[i] =
nodes[hash[father]].birth("${family.getChildName()}",{partner:nodes[hash[mother]]});
#elseif(!$family.getFather() && $family.getMother()!="")
=======================================
--- /branches/mhk_families/idb/etc/template/new/rperson_identification.vm
Tue Jul 12 11:48:19 2011
+++ /branches/mhk_families/idb/etc/template/new/rperson_identification.vm
Mon May 27 17:26:00 2013
@@ -73,7 +73,7 @@
<li><a
href="${uri}?dbname=$!dbname&action=exec&script=rperson_acts.vm&rid=$Entity.id&name=$!Entity.description">$mhks.get('rperson.all.acts')</a></li>
<li><a
href="${uri}?dbname=$!dbname&action=exec&script=rperson_related.vm&rid=$Entity.id&name=$!Entity.description">$mhks.get('rperson.related')</a></li>
<li><span>$mhks.get('rperson.identification')</span></li>
- ##<li><a
href="${uri}?dbname=$db.dbname&action=exec&script=rperson_family.vm&rid=$Entity.id&name=$!Entity.description">Family</a></li>
+ <li><a
href="${uri}?dbname=$db.dbname&action=exec&script=rperson_family.vm&rid=$Entity.id&name=$!Entity.description">$mhks.get('rperson.family')</a></li>
</ul>
</div>
#if(!$showtable.equals("no"))
=======================================
--- /branches/mhk_families/idb/etc/template/new/rperson_related.vm Mon Nov
29 10:12:47 2010
+++ /branches/mhk_families/idb/etc/template/new/rperson_related.vm Mon May
27 17:26:00 2013
@@ -68,7 +68,7 @@
<li><a
href="${uri}?dbname=$!dbname&action=exec&script=rperson_acts.vm&rid=$Entity.id&name=$!Entity.description">$mhks.get('rperson.all.acts')</a></li>
<li><span>$mhks.get('rperson.related')</span></li>
<li><a
href="${uri}?dbname=$!dbname&action=exec&script=rperson_identification.vm&rid=$Entity.id&name=$!Entity.description">$mhks.get('rperson.identification')</a></li>
- ##<li><a
href="${uri}?dbname=$db.dbname&action=exec&script=rperson_family.vm&rid=$Entity.id&name=$!Entity.description">Family</a></li>
+ <li><a
href="${uri}?dbname=$db.dbname&action=exec&script=rperson_family.vm&rid=$Entity.id&name=$!Entity.description">$mhks.get('rperson.family')</a></li>
</ul>
</div>