include languages menu in header2, if it is available

app/views/header2.htm

@@ -1,29 +1,36 @@
 <header>
-<check if="{{ @logo }}">
+
+  <check if="{{ @navi.languages }}">
+    <div class="languages">
+      <include href="navigation.htm" with="menu={{ @navi.languages }}" />
+    </div>  
+  </check>
+  
+  <check if="{{ @logo }}">
     <true>
-    <a href="{{ @SITE_URL }}/"><h1>
-        <img src="/{{ @logo }}" alt="{{ @title }}" />
-        </h1></a>
+      <a href="{{ @SITE_URL }}/"><h1>
+          <img src="/{{ @logo }}" alt="{{ @title }}" />
+      </h1></a>
     </true>
     <false>
-    <h1>{{ @title }}</h1>
+      <h1>{{ @title }}</h1>
     </false>    
-</check>
+  </check>
 
-<check if="{{ @subTitle }}">
+  <check if="{{ @subTitle }}">
     <h2>{{ @subTitle }}</h2>
-</check>
+  </check>
 
-<check if="{{ @headerInfo1 || @headerInfo2 }}">
-<div class="headerInfo">
-  <span class="headerInfo1">{{ @headerInfo1 }}</span>
-  <span class="headerInfo2">{{ @headerInfo2 }}</span>
-</div>
-</check>
+  <check if="{{ @headerInfo1 || @headerInfo2 }}">
+    <div class="headerInfo">
+      <span class="headerInfo1">{{ @headerInfo1 }}</span>
+      <span class="headerInfo2">{{ @headerInfo2 }}</span>
+    </div>
+  </check>
 </header>
 
 <check if="{{ @banner }}">
-    <true>
+  <true>
     <div id="site-banner"><img src="/{{ @banner }}" alt="{{ @subTitle }}" /></div>
-    </true>
+  </true>
 </check>

app/views/navigation.htm

@@ -1,7 +1,7 @@
 <ul class="nav level{{ @level }}">
     <repeat group="{{ @menu }}" key="{{ @key }}" value="{{ @item }}">
         
-        <li class="{{ @item.class }}"><a href="{{ @item.href }}">{{ @item.name }}</a>
+        <li class="{{ @item.class }}"><a href="{{ @item.href }}">{{ @item.name | raw }}</a>
             <check if="{{ is_array(@item.submenu) }}">
                 <include href="navigation.htm" with="menu={{ @item.submenu }},level={{ @level + 1 }}" />
             </check>