Merge branch 'master' into patch-1
This commit is contained in:
@@ -1,18 +1,18 @@
|
||||
[% BLOCK makeSubMenu %]
|
||||
<li class="dropdown" [% IF id; HTML.attributes(id => id); END %] >
|
||||
<a class="dropdown-toggle" href="#" data-toggle="dropdown">[% title %]<b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li class="nav-item dropdown" [% IF id; HTML.attributes(id => id); END %] >
|
||||
<a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">[% title %]<b class="caret"></b></a>
|
||||
<div class="dropdown-menu[% IF align == 'right' %] dropdown-menu-right[% END %]">
|
||||
[% content %]
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
[% END %]
|
||||
[% showPrivate = (isPrivateHydra && c.user_exists) || ! isPrivateHydra %]
|
||||
|
||||
[% IF showPrivate %]
|
||||
<ul class="nav pull-left">
|
||||
<ul class="navbar-nav mr-auto">
|
||||
|
||||
[% IF c.user_exists %]
|
||||
[% INCLUDE menuItem uri = c.uri_for(c.controller('User').action_for('dashboard'), [c.user.username]) title = "Dashboard" %]
|
||||
[% INCLUDE navItem uri = c.uri_for(c.controller('User').action_for('dashboard'), [c.user.username]) title = "Dashboard" %]
|
||||
[% END %]
|
||||
|
||||
[% WRAPPER makeSubMenu title="Status" %]
|
||||
@@ -41,18 +41,18 @@
|
||||
|
||||
[% IF project %]
|
||||
[% WRAPPER makeSubMenu title="Project" %]
|
||||
<li class="nav-header">[% HTML.escape(project.name) %]</li>
|
||||
<li class="divider"></li>
|
||||
<h6 class="dropdown-header">[% HTML.escape(project.name) %]</h6>
|
||||
<div class="dropdown-divider"></div>
|
||||
[% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('project'), [project.name]) title = "Overview" %]
|
||||
[% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('all'), [project.name]) title = "Latest builds" %]
|
||||
[% INCLUDE menuItem uri = c.uri_for('/project' project.name 'channel' 'latest') title = "Channel" %]
|
||||
[% IF localStore %][% INCLUDE menuItem uri = c.uri_for('/project' project.name 'channel' 'latest') title = "Channel" %][% END %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
|
||||
[% IF jobset %]
|
||||
[% WRAPPER makeSubMenu title="Jobset" %]
|
||||
<li class="nav-header">[% HTML.escape(jobset.name) %]</li>
|
||||
<li class="divider"></li>
|
||||
<h6 class="dropdown-header">[% HTML.escape(jobset.name) %]</h6>
|
||||
<div class="dropdown-divider"></div>
|
||||
[% INCLUDE menuItem
|
||||
uri = c.uri_for(c.controller('Jobset').action_for('jobset'), [project.name, jobset.name])
|
||||
title = "Overview" %]
|
||||
@@ -62,21 +62,21 @@
|
||||
[% INCLUDE menuItem
|
||||
uri = c.uri_for(c.controller('Jobset').action_for('all'), [project.name, jobset.name])
|
||||
title = "Latest builds" %]
|
||||
[% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'channel' 'latest') title = "Channel" %]
|
||||
[% IF localStore %][% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'channel' 'latest') title = "Channel" %][% END %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
|
||||
[% IF job %]
|
||||
[% WRAPPER makeSubMenu title="Job" %]
|
||||
<li class="nav-header">[% HTML.escape(job) %]</li>
|
||||
<li class="divider"></li>
|
||||
<h6 class="dropdown-header">[% HTML.escape(job) %]</h6>
|
||||
<div class="dropdown-divider"></div>
|
||||
[% INCLUDE menuItem
|
||||
uri = c.uri_for(c.controller('Job').action_for('overview'), [project.name, jobset.name, job])
|
||||
title = "Overview" %]
|
||||
[% INCLUDE menuItem
|
||||
uri = c.uri_for(c.controller('Job').action_for('all'), [project.name, jobset.name, job])
|
||||
title = "Latest builds" %]
|
||||
[% INCLUDE menuItem uri = c.uri_for('/job' project.name jobset.name job 'channel' 'latest') title = "Channel" %]
|
||||
[% IF localStore %][% INCLUDE menuItem uri = c.uri_for('/job' project.name jobset.name job 'channel' 'latest') title = "Channel" %][% END %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
[% WRAPPER makeSubMenu title="Admin" %]
|
||||
[% IF c.check_user_roles('admin') || c.check_user_roles('create-projects') %]
|
||||
[% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create')) title = "Create project" %]
|
||||
<li class="divider"></li>
|
||||
<div class="dropdown-divider"></div>
|
||||
[% END %]
|
||||
[% IF c.check_user_roles('admin') %]
|
||||
[% INCLUDE menuItem
|
||||
@@ -97,7 +97,7 @@
|
||||
[% INCLUDE menuItem
|
||||
uri = c.uri_for(c.controller('Admin').action_for('users'))
|
||||
title = "Manage users" %]
|
||||
<li class="divider"></li>
|
||||
<div class="dropdown-divider"></div>
|
||||
[% INCLUDE menuItem
|
||||
uri = c.uri_for(c.controller('Admin').action_for('clear_queue_non_current'))
|
||||
title = "Cancel queued non-current builds"
|
||||
@@ -120,32 +120,33 @@
|
||||
</ul>
|
||||
[% END %]
|
||||
|
||||
<ul class="nav pull-right">
|
||||
[% IF showPrivate %]
|
||||
<form class="form-inline" action="[% c.uri_for('/search') %]">
|
||||
<input name="query" type="text" class="form-control" placeholder="Search" [% HTML.attributes(value => c.req.params.query) %]/>
|
||||
</form>
|
||||
[% END %]
|
||||
|
||||
<ul class="navbar-nav">
|
||||
|
||||
[% IF showPrivate %]
|
||||
<form class="navbar-search" action="[% c.uri_for('/search') %]">
|
||||
<input name="query" type="text" class="search-query span2" placeholder="Search" [% HTML.attributes(value => c.req.params.query) %]/>
|
||||
</form>
|
||||
[% END %]
|
||||
[% IF c.user_exists %]
|
||||
[% INCLUDE menuItem uri = c.uri_for(c.controller('User').action_for('edit'), [c.user.username]) title = "Preferences" %]
|
||||
<li>
|
||||
<a href="#" onclick="signOut();">Sign out</a>
|
||||
[% INCLUDE navItem uri = c.uri_for(c.controller('User').action_for('edit'), [c.user.username]) title = "Preferences" %]
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="#" onclick="signOut();">Sign out</a>
|
||||
</li>
|
||||
[% ELSE %]
|
||||
[% WRAPPER makeSubMenu title="Sign in" id="sign-in-menu" %]
|
||||
[% WRAPPER makeSubMenu title="Sign in" id="sign-in-menu" align="right" %]
|
||||
[% IF c.config.enable_google_login %]
|
||||
<div style="display: none" class="g-signin2" data-onsuccess="onGoogleSignIn" data-theme="dark"></div></a>
|
||||
<li><a href="#" id="google-signin">Sign in with Google</a></li>
|
||||
<li class="divider"></li>
|
||||
<script src="https://accounts.google.com/gsi/client" async defer></script>
|
||||
<div id="g_id_onload" data-client_id="[% c.config.google_client_id %]" data-auto_prompt="false" data-callback="onGoogleSignIn">
|
||||
</div>
|
||||
<div class="g_id_signin" data-type="standard"></div>
|
||||
<div class="dropdown-divider"></div>
|
||||
[% END %]
|
||||
[% IF c.config.github_client_id %]
|
||||
<li><a href="/github-redirect?after=[% c.req.path %]">Sign in with GitHub</a></li>
|
||||
<li class="divider"></li>
|
||||
<a class="dropdown-item" href="/github-redirect?after=[% c.req.path %]">Sign in with GitHub</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
[% END %]
|
||||
<li>
|
||||
<a href="#hydra-signin" data-toggle="modal">Sign in with a Hydra account</a>
|
||||
</li>
|
||||
<a class="dropdown-item" href="#hydra-signin" data-toggle="modal">Sign in with a Hydra account</a>
|
||||
[% END %]
|
||||
[% END %]
|
||||
|
||||
|
Reference in New Issue
Block a user