diff --git a/src/root/common.tt b/src/root/common.tt index d691bc8d..6a8b576c 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -34,17 +34,17 @@ BLOCK renderJobsetName %] BLOCK renderJobName %] -[% job %] +[% job %] [% END; BLOCK renderFullJobsetName %] -[% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %] +[% INCLUDE renderProjectName inRow=0 %]:[% INCLUDE renderJobsetName %] [% END; BLOCK renderFullJobName %] -[% IF !hideProjectName; INCLUDE renderProjectName %]:[% END; IF !hideJobsetName; INCLUDE renderJobsetName %]:[% END; INCLUDE renderJobName %] +[% IF !hideProjectName; INCLUDE renderProjectName inRow=0 %]:[% END; IF !hideJobsetName; INCLUDE renderJobsetName inRow=0 %]:[% END; INCLUDE renderJobName %] [% END; diff --git a/src/root/search.tt b/src/root/search.tt index 7b67b367..f64be628 100644 --- a/src/root/search.tt +++ b/src/root/search.tt @@ -5,14 +5,14 @@

The following projects match your query:

- +
[% FOREACH p IN projects %] - + [% END %] @@ -25,14 +25,14 @@

The following jobsets match your query:

-
ProjectDescription
[% INCLUDE renderProjectName project=p.name %][% INCLUDE renderProjectName project=p.name inRow=1 %] [% HTML.escape(p.description) %]
+
[% FOREACH j IN jobsets %] - + [% END %] @@ -45,14 +45,14 @@

The following jobs match your query:[% IF jobs.size > limit %] (first [% limit %] results only)[% END %]

-
JobsetDescription
[% INCLUDE renderFullJobsetName project=j.get_column('project') jobset=j.name %][% INCLUDE renderFullJobsetName project=j.get_column('project') jobset=j.name inRow=1 %] [% HTML.escape(j.description) %]
+
[% FOREACH j IN jobs %] - + [% END %] diff --git a/src/root/users.tt b/src/root/users.tt index 56d54088..13ec5e62 100644 --- a/src/root/users.tt +++ b/src/root/users.tt @@ -1,30 +1,29 @@ [% WRAPPER layout.tt title="Users" %] [% PROCESS common.tt %] -
Job
[% INCLUDE renderFullJobName project=j.get_column('project') jobset=j.get_column('jobset') job=j.name %][% INCLUDE renderFullJobName project=j.get_column('project') jobset=j.get_column('jobset') job=j.name inRow=1 %]
- - - - - - - - - - - - [% FOREACH u IN users %] - - - - - - - - - [% END %] - - +
UsernameNameEmailRolesEval. notificationsOptions
[% u.username %][% u.fullname %][% u.emailaddress %][% FOREACH r IN u.userroles %][% r.role %] [% END %][% IF u.emailonerror %]Yes[% ELSE %]No[% END %][% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('reset_password'), [u.username]) content = "Reset password" confirmmsg = "Are you sure you want to reset the password for this user?" class = "btn btn-mini" %]
+ + + + + + + + + + + + [% FOREACH u IN users %] + + + + + + + + + [% END %] +
UsernameNameEmailRolesEval. notificationsOptions
[% u.username %][% u.fullname %][% u.emailaddress %][% FOREACH r IN u.userroles %][% r.role %] [% END %][% IF u.emailonerror %]Yes[% ELSE %]No[% END %][% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('reset_password'), [u.username]) content = "Reset password" confirmmsg = "Are you sure you want to reset the password for this user?" class = "btn btn-mini" %]