Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix style of quick search autocomplete in topbar 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1304956 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-03-24 22:56:20 +00:00
parent 57ccb2fc4b
commit 0b77f79f84
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
View File

@ -286,8 +286,8 @@ $(function() {
startArchivaApplication=function(){
$.log("startArchivaApplication");
$('#topbar-menu-container').html($("#topbar_menu_tmpl" ).tmpl());//$("#topbar-menu"));
$('#sidebar-content').html( $("#main_menu_tmpl").tmpl());
$('#topbar-menu-container').html($("#topbar_menu_tmpl" ).tmpl());
$('#sidebar-content').html($("#main_menu_tmpl").tmpl());
hideElementWithKarma();
checkSecurityLinks();

22
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
View File

@ -82,40 +82,38 @@
<div style="max-height: 40px" class="navbar-inner">
<div class="container-fluid">
<div id="organisation-logo" class="pull-left"></div>
<div class="nav-collapse">
<ul class="nav pull-right">
<li id="create-admin-link" class="pull-right" style="display: none">
<li id="create-admin-link" style="display: none">
<a href="#" onclick="adminCreateBox();" id="create-admin-link-a">
<span class="label label-important">${$.i18n.prop('create.admin.page.link')}</span>
</a>
</li>
<li id="login-link" class="pull-right" style="display: none">
<li id="login-link" style="display: none">
<a href="#" onclick="loginBox();" id="login-link-a">
<span class="label label-success force-upper-case">${$.i18n.prop('login')}</span>
</a>
</li>
<li id="change-password-link" class="pull-right" style="">
<li id="change-password-link">
<a href="#" onclick="editUserDetailsBox();">${$.i18n.prop('edit.details')}</a>
</li>
<li id="logout-link" class="pull-right" style="display: none">
<li id="logout-link" style="display: none">
<a href="#" onclick="logout(true);" id="logout-link-a">
<span class="label label-important force-upper-case">${$.i18n.prop('logout')}</span>
</a>
</li>
<li id="register-link" class="pull-right" style="display: none">
<li id="register-link" style="display: none">
<a href="#" onclick="registerBox();" id="register-link-a">
<span class="label label-info force-upper-case">${$.i18n.prop('register')}</span>
</a>
</li>
<li class="pull-right">
<div class="ui-widget">
<input type="text" class="ui-autocomplete-input" id="quick-search-autocomplete"
placeholder="${$.i18n.prop('menu.topbar.quicksearch')}" />
<li>
<div class="ui-widget navbar-search">
<input type="text" class="ui-autocomplete-input search-query" id="quick-search-autocomplete"
placeholder="${$.i18n.prop('menu.topbar.quicksearch')}" />
</div>
</li>
</ul>
</div>
</div>
</div>