فهرست منبع

Merge pull request #465 from kw-udon/dev

Adjust position of logo image
Shinsuke Sugaya 9 سال پیش
والد
کامیت
84b265ba95

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/UserService.java

@@ -75,7 +75,7 @@ public class UserService implements Serializable {
 
 
     }
     }
 
 
-    public void chnagePassword(final String username, final String password) {
+    public void changePassword(final String username, final String password) {
         ComponentUtil.getLdapManager().changePassword(username, password);
         ComponentUtil.getLdapManager().changePassword(username, password);
 
 
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         final FessConfig fessConfig = ComponentUtil.getFessConfig();

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/profile/ProfileAction.java

@@ -67,7 +67,7 @@ public class ProfileAction extends FessSearchAction {
         validatePasswordForm(form, toIndexPage);
         validatePasswordForm(form, toIndexPage);
         final String username = getUserBean().map(u -> u.getUserId()).get();
         final String username = getUserBean().map(u -> u.getUserId()).get();
         try {
         try {
-            userService.chnagePassword(username, form.newPassword);
+            userService.changePassword(username, form.newPassword);
             saveInfo(messages -> messages.addSuccessChangedPassword(GLOBAL));
             saveInfo(messages -> messages.addSuccessChangedPassword(GLOBAL));
         } catch (final Exception e) {
         } catch (final Exception e) {
             logger.error("Failed to change password for " + username, e);
             logger.error("Failed to change password for " + username, e);

+ 6 - 0
src/main/webapp/css/style.css

@@ -240,6 +240,10 @@ body.search #searchOptions.active, body.help #searchOptions.active,  body.error
 	display: inline-block;
 	display: inline-block;
 }
 }
 
 
+.navbar-brand img {
+	padding-top: 4px;
+}
+
 /* Large desktop */
 /* Large desktop */
 @media ( min-width : 74.9em) {
 @media ( min-width : 74.9em) {
 	.visible-xs {
 	.visible-xs {
@@ -274,6 +278,7 @@ body.search #searchOptions.active, body.help #searchOptions.active,  body.error
 	}
 	}
 	.navbar-brand img {
 	.navbar-brand img {
 		width: 80px;
 		width: 80px;
+		padding-top: 6.5px;
 	}
 	}
 	.searchFormBox {
 	.searchFormBox {
 		margin-top: 20px;
 		margin-top: 20px;
@@ -312,6 +317,7 @@ body.search #searchOptions.active, body.help #searchOptions.active,  body.error
 	}
 	}
 	.navbar-brand img {
 	.navbar-brand img {
 		width: 80px;
 		width: 80px;
+		padding-top: 6.5px;
 	}
 	}
 	.searchFormBox {
 	.searchFormBox {
 		margin-top: 80px;
 		margin-top: 80px;