bug 3765: move road type after address

I have fixed 2 road type issues.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 56dd2f2..443e12b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -14,6 +14,9 @@
 <!-- /TMPL_IF -->
     <li><!-- TMPL_IF NAME="address"-->
             <!-- TMPL_VAR NAME="address" -->
+            <!--TMPL_IF NAME="roaddetails"-->
+                <!-- TMPL_VAR NAME="roaddetails" -->
+            <!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
             <span class="empty">No address stored.</span>
     <!-- /TMPL_IF --></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 240e75e..f5e8f1b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -163,10 +163,10 @@ if (nodename =="barcodes[]"){
      <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" -->&ldquo;<!-- TMPL_VAR NAME="othernames" -->&rdquo;<!-- /TMPL_IF -->
 
 <p class="address"><!-- TMPL_VAR NAME="streetnumber" -->
+        <!-- TMPL_VAR NAME="address" -->         
         <!--TMPL_IF NAME="roaddetails"-->
-         <!-- TMPL_VAR NAME="roaddetails" -->,
-        <!-- /TMPL_IF -->
-        <!-- TMPL_VAR NAME="address" --><br />
+         <!-- TMPL_VAR NAME="roaddetails" -->
+        <!-- /TMPL_IF --><br />
         <!-- TMPL_IF NAME="address2" --><!-- TMPL_VAR NAME="address2"--><br /><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="city" --><!-- TMPL_VAR NAME="city" --><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="zipcode" --><!-- TMPL_VAR NAME="zipcode" --><br /><!-- /TMPL_IF -->