Quellcode durchsuchen

Merge pull request #231 from pwm-project/rkeil-fixes

Rkeil fixes

This was the first pull request done with the new approval mechanism
James Albright vor 7 Jahren
Ursprung
Commit
32c38eb211

+ 2 - 2
server/src/main/java/password/pwm/svc/PwmServiceEnum.java

@@ -34,13 +34,13 @@ public enum PwmServiceEnum {
     DatabaseService(        password.pwm.util.db.DatabaseService.class,             Flag.StartDuringRuntimeInstance),
     SharedHistoryManager(   password.pwm.svc.wordlist.SharedHistoryManager.class),
     AuditService(           password.pwm.svc.event.AuditService.class),
-    StatisticsManager(      password.pwm.svc.stats.StatisticsManager.class),
+    StatisticsManager(      password.pwm.svc.stats.StatisticsManager.class,         Flag.StartDuringRuntimeInstance),
     WordlistManager(        password.pwm.svc.wordlist.WordlistManager.class),
     SeedlistManager(        password.pwm.svc.wordlist.SeedlistManager.class),
     EmailQueueManager(      password.pwm.util.queue.EmailQueueManager.class),
     SmsQueueManager(        password.pwm.util.queue.SmsQueueManager.class),
     UrlShortenerService(    password.pwm.svc.shorturl.UrlShortenerService.class),
-    TokenService(           password.pwm.svc.token.TokenService.class),
+    TokenService(           password.pwm.svc.token.TokenService.class,              Flag.StartDuringRuntimeInstance),
     IntruderManager(        password.pwm.svc.intruder.IntruderManager.class),
     CrService(              password.pwm.util.operations.CrService.class,           Flag.StartDuringRuntimeInstance),
     OtpService(             password.pwm.util.operations.OtpService.class),

+ 2 - 2
server/src/main/webapp/WEB-INF/jsp/fragment/footer.jsp

@@ -48,11 +48,11 @@
             </pwm:if>
             <pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.HIDE_LOCALE%>" negate="true">
                 <span class="footer-segment">
-                    <button id="localeSelectionMenu">
+                    <span id="localeSelectionMenu">
                         <img src="<pwm:context/><pwm:url url='/public/resources/webjars/famfamfam-flags/dist/png/'/><pwm:value name="<%=PwmValue.localeFlagFile%>"/>.png"
                              alt="<pwm:value name="<%=PwmValue.localeFlagFile%>"/>"/>
                         <span class="localeDisplayName"><pwm:value name="<%=PwmValue.localeName%>"/></span>
-                    </button>
+                    </span>
                 </span>
             </pwm:if>
         </div>