Merge pull request pwm-project#13 from pwm-project/fontawesome-changes

Removed references to font-awesome
ldchrist · Dec 1, 2015 · 0a4c9b1 · 0a4c9b1
2 parents 0acf579 + 656cc19
commit 0a4c9b1
Show file tree

Hide file tree

Showing 95 changed files with 2,141 additions and 316 deletions.
diff --git a/src/main/webapp/WEB-INF/jsp/activateuser-agreement.jsp b/src/main/webapp/WEB-INF/jsp/activateuser-agreement.jsp
@@ -48,7 +48,7 @@
                     <br/><br/>
                 <input type="hidden" name="processAction" value="agree"/>
                 <button type="submit" name="button" class="btn" id="submitBtn">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-forward"></span></pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-forward"></span></pwm:if>
                     <pwm:display key="Button_Continue"/>
                 </button>
                 <input type="hidden" name="pwmFormID" id="pwmFormID" value="<pwm:FormID/>"/>

diff --git a/src/main/webapp/WEB-INF/jsp/activateuser-entercode.jsp b/src/main/webapp/WEB-INF/jsp/activateuser-entercode.jsp
@@ -44,7 +44,7 @@
             <form action="<pwm:current-url/>" method="post" enctype="application/x-www-form-urlencoded" name="search" class="pwm-form" style="display: inline;">
                 <textarea id="<%=PwmConstants.PARAM_TOKEN%>" name="<%=PwmConstants.PARAM_TOKEN%>" class="tokenInput"></textarea>
                 <button type="submit" class="btn" name="search" id="submitBtn">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-check"></span>&nbsp</pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-check"></span>&nbsp</pwm:if>
                     <pwm:display key="Button_CheckCode"/>
                 </button>
                 <input type="hidden" id="processAction" name="processAction" value="enterCode"/>
@@ -54,7 +54,7 @@
                 <form action="<pwm:current-url/>" method="post" enctype="application/x-www-form-urlencoded" style="display: inline;">
                     <input type="hidden" name="processAction" value="reset"/>
                     <button type="submit" name="button" class="btn" id="buttonCancel">
-                        <pwm:if test="showIcons"><span class="btn-icon fa fa-times"></span>&nbsp</pwm:if>
+                        <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-times"></span>&nbsp</pwm:if>
                         <pwm:display key="Button_Cancel"/>
                     </button>
                     <input type="hidden" name="pwmFormID" value="<pwm:FormID/>"/>

diff --git a/src/main/webapp/WEB-INF/jsp/activateuser.jsp b/src/main/webapp/WEB-INF/jsp/activateuser.jsp
@@ -38,7 +38,7 @@
             <jsp:include page="fragment/form.jsp"/>
             <div class="buttonbar">
                 <button type="submit" name="button" class="btn" id="submitBtn">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-forward"></span></pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-forward"></span></pwm:if>
                     <pwm:display key="Button_Activate"/>
                 </button>
                 <input type="hidden" name="processAction" value="activate"/>

diff --git a/src/main/webapp/WEB-INF/jsp/admin-activity.jsp b/src/main/webapp/WEB-INF/jsp/admin-activity.jsp
@@ -67,7 +67,7 @@
                            data-dojo-props="constraints:{min:10,max:10000000,pattern:'#'},smallDelta:100"/>
                     Rows
                     <button class="btn" type="button" id="button-activeSessionRefresh">
-                        <pwm:if test="showIcons"><span class="btn-icon fa fa-refresh">&nbsp;</span></pwm:if>
+                        <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-refresh">&nbsp;</span></pwm:if>
                         <pwm:display key="Button_Refresh" bundle="Admin"/>
                     </button>
                     <pwm:script>
@@ -97,12 +97,12 @@
                            data-dojo-props="constraints:{min:10,max:10000000,pattern:'#'},smallDelta:100"/>
                     Rows
                     <button class="btn" type="button" id="button-refreshAuditUser">
-                        <pwm:if test="showIcons"><span class="btn-icon fa fa-refresh">&nbsp;</span></pwm:if>
+                        <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-refresh">&nbsp;</span></pwm:if>
                         <pwm:display key="Button_Refresh" bundle="Admin"/>
                     </button>
                     <form action="<pwm:current-url/>" method="post" enctype="application/x-www-form-urlencoded">
                         <button type="submit" class="btn">
-                            <pwm:if test="showIcons"><span class="btn-icon fa fa-download"></span></pwm:if>
+                            <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-download"></span></pwm:if>
                             <pwm:display key="Button_DownloadCSV" bundle="Admin"/>
                         </button>
                         <input type="hidden" name="processAction" value="downloadAuditLogCsv"/>
@@ -118,12 +118,12 @@
                            data-dojo-props="constraints:{min:10,max:10000000,pattern:'#'},smallDelta:100"/>
                     Rows
                     <button class="btn" type="button" id="button-refreshHelpdeskUser">
-                        <pwm:if test="showIcons"><span class="btn-icon fa fa-refresh">&nbsp;</span></pwm:if>
+                        <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-refresh">&nbsp;</span></pwm:if>
                         <pwm:display key="Button_Refresh" bundle="Admin"/>
                     </button>
                     <form action="<pwm:current-url/>" method="post" enctype="application/x-www-form-urlencoded">
                         <button type="submit" class="btn">
-                            <pwm:if test="showIcons"><span class="btn-icon fa fa-download"></span></pwm:if>
+                            <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-download"></span></pwm:if>
                             <pwm:display key="Button_DownloadCSV" bundle="Admin"/>
                         </button>
                         <input type="hidden" name="processAction" value="downloadAuditLogCsv"/>
@@ -139,12 +139,12 @@
                            data-dojo-props="constraints:{min:10,max:10000000,pattern:'#'},smallDelta:100"/>
                     Rows
                     <button class="btn" type="button" id="button-refreshSystemAudit">
-                        <pwm:if test="showIcons"><span class="btn-icon fa fa-refresh">&nbsp;</span></pwm:if>
+                        <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-refresh">&nbsp;</span></pwm:if>
                         <pwm:display key="Button_Refresh" bundle="Admin"/>
                     </button>
                     <form action="<pwm:current-url/>" method="post" enctype="application/x-www-form-urlencoded">
                         <button type="submit" class="btn">
-                            <pwm:if test="showIcons"><span class="btn-icon fa fa-download"></span></pwm:if>
+                            <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-download"></span></pwm:if>
                             <pwm:display key="Button_DownloadCSV" bundle="Admin"/>
                         </button>
                         <input type="hidden" name="processAction" value="downloadAuditLogCsv"/>
@@ -160,7 +160,7 @@
                    data-dojo-props="constraints:{min:10,max:10000000,pattern:'#'},smallDelta:100"/>
             Rows
             <button class="btn" type="button" onclick="PWM_ADMIN.refreshIntruderGrid()">
-                <pwm:if test="showIcons"><span class="btn-icon fa fa-refresh">&nbsp;</span></pwm:if>
+                <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-refresh">&nbsp;</span></pwm:if>
                 <pwm:display key="Button_Refresh" bundle="Admin"/>
             </button>
         </div>

diff --git a/src/main/webapp/WEB-INF/jsp/admin-analysis.jsp b/src/main/webapp/WEB-INF/jsp/admin-analysis.jsp
@@ -76,7 +76,7 @@
                     <div style="text-align: center">
                         <form action="<pwm:current-url/>" method="post">
                             <button type="submit" class="btn" id="button-downloadUserSummaryCsv">
-                                <pwm:if test="showIcons"><span class="btn-icon fa fa-download">&nbsp;</span></pwm:if>
+                                <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-download">&nbsp;</span></pwm:if>
                                 <pwm:display key="Button_DownloadCSV" bundle="Admin"/>
                             </button>
                             <input type="hidden" name="processAction" value="downloadUserSummaryCsv"/>
@@ -92,12 +92,12 @@
                                data-dojo-props="constraints:{min:10,max:50000,pattern:'#'},smallDelta:100"/>
                         Rows
                         <button class="btn" type="button" id="button-refreshReportDataGrid">
-                            <pwm:if test="showIcons"><span class="btn-icon fa fa-refresh">&nbsp;</span></pwm:if>
+                            <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-refresh">&nbsp;</span></pwm:if>
                             <pwm:display key="Button_Refresh" bundle="Admin"/>
                         </button>
                         <form action="<pwm:current-url/>" method="post">
                             <button type="submit" class="btn" id="button-downloadUserReportCsv">
-                                <pwm:if test="showIcons"><span class="btn-icon fa fa-download">&nbsp;</span></pwm:if>
+                                <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-download">&nbsp;</span></pwm:if>
                                 <pwm:display key="Button_DownloadCSV" bundle="Admin"/>
                             </button>
                             <pwm:script>
@@ -130,17 +130,17 @@
                     <table style="width:450px;">
                         <tr><td style="text-align: center; cursor: pointer">
                             <button id="reportStartButton" class="btn">
-                                <pwm:if test="showIcons"><span class="btn-icon fa fa-play">&nbsp;</span></pwm:if>
+                                <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-play">&nbsp;</span></pwm:if>
                                 <pwm:display key="Button_Report_Start" bundle="Admin"/>
                             </button>
                             &nbsp;&nbsp;
                             <button id="reportStopButton" class="btn">
-                                <pwm:if test="showIcons"><span class="btn-icon fa fa-stop">&nbsp;</span></pwm:if>
+                                <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-stop">&nbsp;</span></pwm:if>
                                 <pwm:display key="Button_Report_Stop" bundle="Admin"/>
                             </button>
                             &nbsp;&nbsp;
                             <button id="reportClearButton" class="btn">
-                                <pwm:if test="showIcons"><span class="btn-icon fa fa-trash-o">&nbsp;</span></pwm:if>
+                                <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-trash-o">&nbsp;</span></pwm:if>
                                 <pwm:display key="Button_Report_Clear" bundle="Admin"/>
                             </button>
                         </td></tr>
@@ -177,7 +177,7 @@
                                             <% } %>
                                         </select>
                                         <button class="btn" type="submit">
-                                            <pwm:if test="showIcons"><span class="btn-icon fa fa-refresh">&nbsp;</span></pwm:if>
+                                            <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-refresh">&nbsp;</span></pwm:if>
                                             <pwm:display key="Button_Refresh" bundle="Admin"/>
                                         </button>
                                     </form>
@@ -201,7 +201,7 @@
                     <div style="text-align: center">
                         <form action="<pwm:current-url/>" method="post" enctype="application/x-www-form-urlencoded">
                             <button type="submit" class="btn" id="button-downloadStatisticsLogCsv">
-                                <pwm:if test="showIcons"><span class="btn-icon fa fa-download"></span></pwm:if>
+                                <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-download"></span></pwm:if>
                                 <pwm:display key="Button_DownloadCSV" bundle="Admin"/>
                             </button>
                             <input type="hidden" name="processAction" value="downloadStatisticsLogCsv"/>

diff --git a/src/main/webapp/WEB-INF/jsp/admin-logview-window.jsp b/src/main/webapp/WEB-INF/jsp/admin-logview-window.jsp
@@ -63,7 +63,7 @@
     </select>
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     <button class="btn" id="button-refresh">
-        <pwm:if test="showIcons"><span class="btn-icon fa fa-refresh"></span></pwm:if>
+        <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-refresh"></span></pwm:if>
         <pwm:display key="Button_Refresh" bundle="Admin"/>
     </button>
 </div>

diff --git a/src/main/webapp/WEB-INF/jsp/admin-logview.jsp b/src/main/webapp/WEB-INF/jsp/admin-logview.jsp
@@ -146,7 +146,7 @@
                     </td>
                     <td class="key" style="border: 0; vertical-align: middle">
                         <button type="submit" name="submit_button" id="submit_button" class="btn">
-                            <pwm:if test="showIcons"><span class="btn-icon fa fa-search"></span></pwm:if>
+                            <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-search"></span></pwm:if>
                             Search
                         </button>
                     </td>

diff --git a/src/main/webapp/WEB-INF/jsp/admin-tokenlookup.jsp b/src/main/webapp/WEB-INF/jsp/admin-tokenlookup.jsp
@@ -163,7 +163,7 @@
             <textarea name="token" id="token" style="width: 580px; height: 150px"></textarea>
             <div class="buttonbar">
                 <button type="submit" name="submitBtn" class="btn" type="submit">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-search"></span></pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-search"></span></pwm:if>
                     Lookup Token
                 </button>
             </div>

diff --git a/src/main/webapp/WEB-INF/jsp/captcha.jsp b/src/main/webapp/WEB-INF/jsp/captcha.jsp
@@ -65,7 +65,7 @@
             <div class="buttonbar">
                 <input type="hidden" name="processAction" value="doVerify"/>
                 <button type="submit" name="verify" class="btn" id="verify_button">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-check"></span></pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-check"></span></pwm:if>
                     <pwm:display key="Button_Verify"/>
                 </button>
                 <input type="hidden" name="pwmFormID" value="<pwm:FormID/>"/>

diff --git a/src/main/webapp/WEB-INF/jsp/changepassword-agreement.jsp b/src/main/webapp/WEB-INF/jsp/changepassword-agreement.jsp
@@ -52,14 +52,14 @@
                     <br/>
                 <input type="hidden" name="processAction" value="agree"/>
                 <button type="submit" name="button" class="btn" id="button_continue">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-forward"></span></pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-forward"></span></pwm:if>
                     <pwm:display key="Button_Continue"/>
                 </button>
                 <input type="hidden" name="pwmFormID" id="pwmFormID" value="<pwm:FormID/>"/>
             </form>
             <form action="<pwm:url url='<%=PwmServletDefinition.Logout.servletUrl()%>' addContext="true"/>" method="post" enctype="application/x-www-form-urlencoded">
                 <button type="submit" name="button" class="btn" id="button_logout">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-sign-out"></span></pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-sign-out"></span></pwm:if>
                     <pwm:display key="Button_Logout"/>
                 </button>
             </form>

diff --git a/src/main/webapp/WEB-INF/jsp/changepassword-complete.jsp b/src/main/webapp/WEB-INF/jsp/changepassword-complete.jsp
@@ -40,7 +40,7 @@
             <form action="<pwm:url url='<%=PwmServletDefinition.Command.servletUrl()%>' addContext="true"/>" method="post" enctype="application/x-www-form-urlencoded" class="pwm-form">
                     <input type="hidden" name="processAction" value="continue"/>
                     <button type="submit" name="button" class="btn" id="submitBtn">
-                        <pwm:if test="showIcons"><span class="btn-icon fa fa-forward"></span></pwm:if>
+                        <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-forward"></span></pwm:if>
                         <pwm:display key="Button_Continue"/>
                     </button>
                 <input type="hidden" name="pwmFormID" id="pwmFormID" value="<pwm:FormID/>"/>

diff --git a/src/main/webapp/WEB-INF/jsp/changepassword-form.jsp b/src/main/webapp/WEB-INF/jsp/changepassword-form.jsp
@@ -51,7 +51,7 @@
             <div class="buttonbar" style="width:100%">
                 <input type="hidden" name="processAction" value="form"/>
                 <button type="submit" name="change" class="btn" id="continue_button">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-forward"></span></pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-forward"></span></pwm:if>
                     <pwm:display key="Button_Continue"/>
                 </button>
                 <% if (!passwordStatus.isExpired() && !passwordStatus.isPreExpired() && !passwordStatus.isViolatesPolicy()) { %>

diff --git a/src/main/webapp/WEB-INF/jsp/changepassword-warn.jsp b/src/main/webapp/WEB-INF/jsp/changepassword-warn.jsp
@@ -56,7 +56,7 @@
                 <input type="hidden" name="warnResponse" value="change"/>
 
                 <button type="submit" name="changePassword" class="btn" id="changePassword">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-key"></span></pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-key"></span></pwm:if>
                     <pwm:display key="Button_ChangePassword"/>
                 </button>
                 <input type="hidden" id="pwmFormID" name="pwmFormID" value="<pwm:FormID/>"/>
@@ -66,7 +66,7 @@
                 <input type="hidden" name="processAction" value="warnResponse"/>
                 <input type="hidden" name="warnResponse" value="skip"/>
                 <button type="submit" name="skipbutton" class="btn" id="skipbutton">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-fighter-jet"></span></pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-fighter-jet"></span></pwm:if>
                     <pwm:display key="Button_Skip"/>
                 </button>
                 <input type="hidden" name="pwmFormID" value="<pwm:FormID/>"/>

diff --git a/src/main/webapp/WEB-INF/jsp/changepassword.jsp b/src/main/webapp/WEB-INF/jsp/changepassword.jsp
@@ -58,10 +58,10 @@
                                 <label style="" for="password1"><pwm:display key="Field_NewPassword"/></label>
                             </h2>
                             &nbsp;&nbsp;
-                            <div class="fa fa-question-circle icon_button" id="password-guide-icon" style="cursor: pointer; visibility: hidden"></div>
+                            <div class="pwm-icon pwm-icon-question-circle icon_button" id="password-guide-icon" style="cursor: pointer; visibility: hidden"></div>
                             <pwm:if test="showRandomPasswordGenerator">
                             &nbsp;&nbsp;
-                            <div class="fa fa-retweet icon_button" id="autogenerate-icon" style="cursor: pointer; visibility: hidden" ></div>
+                            <div class="pwm-icon pwm-icon-retweet icon_button" id="autogenerate-icon" style="cursor: pointer; visibility: hidden" ></div>
                             </pwm:if>
                         </div>
                         <input type="<pwm:value name="passwordFieldType"/>" name="password1" id="password1" class="changepasswordfield passwordfield" <pwm:autofocus/>/>
@@ -100,7 +100,7 @@
             <div class="buttonbar" style="width:100%">
                 <input type="hidden" name="processAction" value="change"/>
                 <button type="submit" name="change" class="btn" id="password_button">
-                    <pwm:if test="showIcons"><span class="btn-icon fa fa-forward"></span></pwm:if>
+                    <pwm:if test="showIcons"><span class="btn-icon pwm-icon pwm-icon-forward"></span></pwm:if>
                     <pwm:display key="Button_ChangePassword"/>
                 </button>
                 <% if (!passwordStatus.isExpired() && !passwordStatus.isPreExpired() && !passwordStatus.isViolatesPolicy()) { %>