From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 28 Feb 2014 10:23:39 +0000 (+0200)
Subject: Merge branch 'master' into mindcoding
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=13a6bf78b6b3de37fde491c576dc654857efc987;hp=fd7ea993642eacb1f0a6beb2a2a8464fcf8480c4;p=gruntmaster-page.git

Merge branch 'master' into mindcoding
---

diff --git a/tmpl/ct.en b/tmpl/ct.en
index d39bbcb..55e8392 100644
--- a/tmpl/ct.en
+++ b/tmpl/ct.en
@@ -7,7 +7,7 @@
 <tmpl_loop running><tr><td><a href="<tmpl_var id>/"><tmpl_var name></a>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{start}; %>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{end};   %>
-<td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
+<td><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a>
 </tmpl_loop>
 </table>
 </tmpl_if>
@@ -21,7 +21,7 @@
 <tmpl_loop pending><tr><td><a href="<tmpl_var id>/"><tmpl_var name></a>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{start}; %>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{end};   %>
-<td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
+<td><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a>
 </tmpl_loop>
 </table>
 </tmpl_if>
@@ -35,7 +35,7 @@
 <tmpl_loop finished><tr><td><a href="<tmpl_var id>/"><tmpl_var name></a>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{start}; %>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{end};   %>
-<td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
+<td><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a>
 </tmpl_loop>
 </table>
 </tmpl_if>
diff --git a/tmpl/log.en b/tmpl/log.en
index de918a2..2179172 100644
--- a/tmpl/log.en
+++ b/tmpl/log.en
@@ -6,7 +6,7 @@
 <td><a href="../pb/<tmpl_var problem>"><tmpl_var name></a>
 <td><tmpl_var date>
 <td><a href="src/<tmpl_var id>.<tmpl_var extension>"<tmpl_if private> data-private</tmpl_if>><tmpl_var size></a>
-<td><a href="/us/<tmpl_var user>"><tmpl_var user></a><tmpl_if user_name> (<tmpl_var user_name>)</tmpl_if><td class="r<tmpl_var result>"><tmpl_var result_text>
+<td><a href="/us/<tmpl_var user>"><tmpl_if user_name><tmpl_var user_name><tmpl_else><tmpl_var user></tmpl_if></a><td class="r<tmpl_var result>"><tmpl_var result_text>
 </tmpl_loop>
 </table>
 
diff --git a/tmpl/pb.en b/tmpl/pb.en
index 341ffbe..35cfbd4 100644
--- a/tmpl/pb.en
+++ b/tmpl/pb.en
@@ -3,7 +3,7 @@
 <table border class="table table-bordered table-striped table-fixed">
 <thead><tr><th>Name<th>Author<th>Owner
 <tbody>
-<tmpl_loop beginner><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
+<tmpl_loop beginner><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a>
 </tmpl_loop>
 </table>
 </tmpl_if>
@@ -13,7 +13,7 @@
 <table border class="table table-bordered table-striped table-fixed">
 <thead><tr><th>Name<th>Author<th>Owner
 <tbody>
-<tmpl_loop easy><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
+<tmpl_loop easy><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a>
 </tmpl_loop>
 </table>
 </tmpl_if>
@@ -23,7 +23,7 @@
 <table border class="table table-bordered table-striped table-fixed">
 <thead><tr><th>Name<th>Author<th>Owner
 <tbody>
-<tmpl_loop medium><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
+<tmpl_loop medium><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a>
 </tmpl_loop>
 </table>
 </tmpl_if>
@@ -33,7 +33,7 @@
 <table border class="table table-bordered table-striped table-fixed">
 <thead><tr><th>Name<th>Author<th>Owner
 <tbody>
-<tmpl_loop hard><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
+<tmpl_loop hard><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a>
 </tmpl_loop>
 </table>
 </tmpl_if>