fix #524 : modify search form position

src/main/webapp/WEB-INF/view/header.jsp

@@ -7,14 +7,35 @@ ${fe:facetForm()}${fe:geoForm()}
 			<img src="${f:url('/images/logo-head.png')}"
 				alt="<la:message key="labels.header_brand_name" />" />
 		</la:link>
-		<ul class="nav navbar-nav hidden-xs-down">
+		<div
+			class="search-box navbar-form col-lg-5 col-md-6 col-sm-6 col-xs-8"
+			role="search">
+			<div class="input-group">
+				<la:text property="q" maxlength="1000" styleId="query"
+					styleClass="form-control" autocomplete="off" />
+				<span class="input-group-btn">
+					<button type="submit" name="search" id="searchButton"
+						class="btn btn-primary">
+						<i class="fa fa-search"></i>
+					</button>
+					<button type="button" class="btn btn-default"
+						data-toggle="control-options" data-target="#searchOptions"
+						id="searchOptionsButton">
+						<i class="fa fa-cog"></i> <span class="sr-only"><la:message
+								key="labels.header_form_option_btn" /></span>
+					</button>
+				</span>
+			</div>
+		</div>
+		<ul class="nav navbar-nav hidden-xs-down pull-right">
 			<c:choose>
 				<c:when test="${!empty username && username != 'guest'}">
 					<li class="nav-item">
 						<div class="dropdown">
 							<a class="nav-link dropdown-toggle" data-toggle="dropdown"
 								href="#" role="button" aria-haspopup="true"
-								aria-expanded="false"> <i class="fa fa-user"></i>${username}
+								aria-expanded="false"> <i class="fa fa-user"></i>
+								<span>${username}</span>
 							</a>
 							<div class="dropdown-menu" aria-labelledby="userMenu">
 								<la:link href="/profile" styleClass="dropdown-item">
@@ -28,35 +49,20 @@ ${fe:facetForm()}${fe:geoForm()}
 					</li>
 				</c:when>
 				<c:when test="${ pageLoginLink }">
-					<li class="nav-item username"><la:link href="/login"
-							styleClass="nav-link" role="button" aria-haspopup="true"
+					<li class="nav-item"><la:link href="/login"
+							styleClass="nav-link  " role="button" aria-haspopup="true"
 							aria-expanded="false">
-							<i class="fa fa-user"></i>
-							<la:message key="labels.login" />
+							<i class="fa fa-sign-in"></i>
+							<span><la:message key="labels.login" /></span>
 						</la:link></li>
 				</c:when>
 			</c:choose>
+			<li class="nav-item"><la:link href="/help" styleClass="nav-link" role="help" aria-haspopup="true"
+					aria-expanded="false">
+					<i class="fa fa-question-circle"></i>
+					<span><la:message key="labels.index_help" /></span>
+				</la:link></li>
 		</ul>
-		<div
-			class="search-box navbar-form col-lg-5 col-md-6 col-sm-6 col-xs-8 pull-right"
-			role="search">
-			<div class="input-group">
-				<la:text property="q" maxlength="1000" styleId="query"
-					styleClass="form-control" autocomplete="off" />
-				<span class="input-group-btn">
-					<button type="submit" name="search" id="searchButton"
-						class="btn btn-primary">
-						<i class="fa fa-search"></i>
-					</button>
-					<button type="button" class="btn btn-default"
-						data-toggle="control-options" data-target="#searchOptions"
-						id="searchOptionsButton">
-						<i class="fa fa-cog"></i> <span class="sr-only"><la:message
-								key="labels.header_form_option_btn" /></span>
-					</button>
-				</span>
-			</div>
-		</div>
 	</nav>
 	<div id="searchOptions" class="control-options">
 		<div class="container">

src/main/webapp/WEB-INF/view/index.jsp

@@ -44,7 +44,7 @@
 						<li class="nav-item username"><la:link href="/login"
 								styleClass="nav-link" role="button" aria-haspopup="true"
 								aria-expanded="false">
-								<i class="fa fa-user"></i>
+								<i class="fa fa-sign-in"></i>
 								<la:message key="labels.login" />
 							</la:link></li>
 					</c:when>

src/main/webapp/css/style.css

@@ -86,19 +86,6 @@ h3 {
 	padding: 0;
 }
 
-.navbar .logout-link {
-	margin-right: 10px;
-}
-
-.navbar .logout-link, .navbar .help-link {
-	color: #ffffff;
-}
-
-.navbar .logout-link:hover, .navbar .help-link:hover {
-	color: #08c;
-	text-decoration: none;
-}
-
 .nav-list li.reset {
 	margin-top: 10px;
 }