minor ui changes

ldchrist · Jan 11, 2016 · 6a4dbc1 · 6a4dbc1
1 parent 1908c5d
commit 6a4dbc1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 179 deletions.
diff --git a/src/main/resources/password/pwm/config/PwmSetting.xml b/src/main/resources/password/pwm/config/PwmSetting.xml
@@ -1383,10 +1383,10 @@
     </setting>
     <setting hidden="false" key="security.loginSession.mode" level="2">
         <default>
-            <value>Local</value>
+            <value>LOCAL</value>
         </default>
         <options>
-            <option value="LOCAL">HttpSession</option>
+            <option value="LOCAL">Local</option>
             <option value="CRYPTCOOKIE">Encrypted Cookie</option>
         </options>
     </setting>

diff --git a/src/main/webapp/WEB-INF/jsp/configguide-ldap_cert.jsp b/src/main/webapp/WEB-INF/jsp/configguide-ldap_cert.jsp
@@ -1,3 +1,4 @@
+<%@ page import="password.pwm.PwmEnvironment" %>
 <%@ page import="password.pwm.http.servlet.configguide.ConfigGuideForm" %>
 <%@ page import="password.pwm.util.StringUtil" %>
 <%@ page import="password.pwm.util.X509Utils" %>
@@ -100,6 +101,7 @@
             <div id="outline_ldapcert-options" class="setting_outline">
                 <div class="setting_title">Certificate Settings</div>
                 <div class="setting_body">
+                    <% if (!JspUtility.getPwmRequest(pageContext).getPwmApplication().getPwmEnvironment().getFlags().contains(PwmEnvironment.ApplicationFlag.Appliance)) { %>
                     <div style="padding-left: 5px; padding-top: 5px">
                         At least one of the following options must be selected to continue.
                     </div>
@@ -113,8 +115,9 @@
                         (Import/remove certificate manually into Java keystore to change)
                     </div>
                     <br/>
+                    <% } %>
                     <div id="titlePane_useConfig" style="padding-left: 5px; padding-top: 5px">
-                        Use application to manage certificate(s) and automatically import certificates into configuration file
+                        Use application to manage certificate(s) and import certificates into configuration file
                         <br/>
                         <label class="checkboxWrapper">
                             <input type="checkbox" id="useConfig" name="useConfig" <%=configGuideBean.isUseConfiguredCerts() ? "checked" : ""%>/> Enabled
@@ -147,7 +150,7 @@
 
         function checkIfNextEnabled() {
             var useConfigChecked = PWM_MAIN.getObject('useConfig').checked;
-            var defaultTrustStoreChecked = PWM_MAIN.getObject('defaultTrustStore').checked;
+            var defaultTrustStoreChecked = PWM_MAIN.getObject('defaultTrustStore') && PWM_MAIN.getObject('defaultTrustStore').checked;
 
             if (useConfigChecked || defaultTrustStoreChecked) {
                 PWM_MAIN.getObject('button_next').disabled = false;

diff --git a/src/main/webapp/WEB-INF/jsp/configguide-ldapcert.jsp b/src/main/webapp/WEB-INF/jsp/configguide-ldapcert.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/configmanager.jsp b/src/main/webapp/WEB-INF/jsp/configmanager.jsp
@@ -1,5 +1,5 @@
+<%@ page import="password.pwm.PwmEnvironment" %>
 <%@ page import="password.pwm.http.JspUtility" %>
-<%@ page import="password.pwm.http.tag.PwmIfTest" %>
 <%@ page import="password.pwm.i18n.Config" %>
 <%@ page import="password.pwm.util.LocaleHelper" %>
 <%@ page import="password.pwm.util.StringUtil" %>
@@ -78,6 +78,7 @@
                     <%=JspUtility.getAttribute(pageContext, PwmRequest.Attribute.ConfigHasPassword)%>
                 </td>
             </tr>
+            <% if (!JspUtility.getPwmRequest(pageContext).getPwmApplication().getPwmEnvironment().getFlags().contains(PwmEnvironment.ApplicationFlag.Appliance)) { %>
             <tr>
                 <td>
                     Application Data Path
@@ -98,6 +99,7 @@
                     </div>
                 </td>
             </tr>
+            <% } %>
         </table>
         <br/>
         <div id="healthBody" style="margin-top:5px; margin-left: 20px; margin-right: 20px; padding:0; max-height: 300px; overflow-y: auto">

diff --git a/src/main/webapp/WEB-INF/jsp/fragment/footer.jsp b/src/main/webapp/WEB-INF/jsp/fragment/footer.jsp
@@ -51,7 +51,6 @@
     <div id="footer-content">
         <span class="infotext">
             <pwm:display key="Display_FooterInfoText"/>&nbsp;
-            GUID = <%=footer_pwmRequest.getPwmSession().getLoginInfoBean().getGuid()%>
         </span>
         <div>
             <% if (footer_pwmRequest.isAuthenticated()) { %>

diff --git a/src/main/webapp/public/resources/js/configeditor-settings.js b/src/main/webapp/public/resources/js/configeditor-settings.js
@@ -2222,7 +2222,7 @@ UserPermissionHandler.draw = function(keyName) {
             var inputID = "value-" + keyName + "-" + rowKey;
 
             if (htmlBody.length > 0) {
-                htmlBody += '<br/><br/><div style="clear:both; text-align:center"><span class="pwm-icon pwm-icon-plus"></span></div>'
+                htmlBody += '<br/><br/><div style="clear:both; text-align:center">OR</span></div>'
             }
 
             htmlBody += '<div class="setting_item_value_wrapper" style="float:left; width: 570px;"><div style="width:100%; text-align:center">';