Menu
▾
▴
[popfile-commit] engine/skins/default administration-page.thtml,1.10,1.11 nntp-security-local.thtml,1.7,1.8 pop3-security-panel.thtml,1.10,1.11 smtp-security-local.thtml,1.6,1.7 xmlrpc-local.thtml,1.6,1.7
|
From: Joseph C. <tex...@us...> - 2006-03-03 09:55:52
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21024/skins/default Modified Files: administration-page.thtml nntp-security-local.thtml pop3-security-panel.thtml smtp-security-local.thtml xmlrpc-local.thtml Log Message: Some more work on new Admin page. Same issues as last commit, plus wrongly using Security_If_Local for disabling remote options while in Stealth Mode (that is for the UI only). We have no global Stealth mode var so this is just a placeholder. Either need a new PF var for the Stealth checkbox or loop through all the modules and if all are local we are in stealth mode. With a sepearate Stealth mode var you could switch to Stealth Mode and leave your current Server Mode options selected. They would be disabled checkboxes but still have checks in them. But that could be confusing. Added Logger Level drop down that needs connecting. Index: xmlrpc-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/xmlrpc-local.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** xmlrpc-local.thtml 2 Mar 2006 11:17:00 -0000 1.6 --- xmlrpc-local.thtml 3 Mar 2006 09:55:49 -0000 1.7 *************** *** 1,3 **** ! <input type="checkbox" name="serveropt_xmlrpc" id="securityAcceptXMLRPC" <TMPL_IF NAME="XMLRPC_local_on"><TMPL_ELSE>checked</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptXMLRPC"> <TMPL_VAR NAME="Localize_Security_XMLRPC"> --- 1,3 ---- ! <input type="checkbox" name="serveropt_xmlrpc" id="securityAcceptXMLRPC" <TMPL_IF NAME="XMLRPC_local_on"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptXMLRPC"> <TMPL_VAR NAME="Localize_Security_XMLRPC"> Index: pop3-security-panel.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/pop3-security-panel.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pop3-security-panel.thtml 2 Mar 2006 11:17:00 -0000 1.10 --- pop3-security-panel.thtml 3 Mar 2006 09:55:49 -0000 1.11 *************** *** 1,3 **** ! <input type="checkbox" name="serveropt_pop3" id="securityAcceptPOP3" <TMPL_IF NAME="POP3_Security_Local"><TMPL_ELSE>checked</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptPOP3"> <TMPL_VAR NAME="Localize_Security_POP3"> --- 1,3 ---- ! <input type="checkbox" name="serveropt_pop3" id="securityAcceptPOP3" <TMPL_IF NAME="POP3_Security_Local"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptPOP3"> <TMPL_VAR NAME="Localize_Security_POP3"> Index: nntp-security-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/nntp-security-local.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** nntp-security-local.thtml 2 Mar 2006 11:17:00 -0000 1.7 --- nntp-security-local.thtml 3 Mar 2006 09:55:49 -0000 1.8 *************** *** 1,3 **** ! <input type="checkbox" name="serveropt_nntp" id="securityAcceptNNTP" <TMPL_IF NAME="nntp_if_local"><TMPL_ELSE>checked</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptNNTP"> <TMPL_VAR NAME="Localize_Security_NNTP"> --- 1,3 ---- ! <input type="checkbox" name="serveropt_nntp" id="securityAcceptNNTP" <TMPL_IF NAME="nntp_if_local"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptNNTP"> <TMPL_VAR NAME="Localize_Security_NNTP"> Index: administration-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/administration-page.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** administration-page.thtml 2 Mar 2006 11:17:00 -0000 1.10 --- administration-page.thtml 3 Mar 2006 09:55:48 -0000 1.11 *************** *** 25,34 **** </label> <br /> ! <input type="radio" name="servermode" id="StealthMode" value="StealthMode" onClick="serverMode(false)" checked /> <label class="administrationLabel" for="StealthMode"> Stealth Mode (disable remote connections) </label> <br /> ! <input type="radio" name="servermode" id="ServerMode" value="ServerMode" onClick="serverMode(true)" /> <label class="administrationLabel" for="ServerMode"> Server Mode (allow remote connections) --- 25,34 ---- </label> <br /> ! <input type="radio" name="servermode" id="StealthMode" value="StealthMode" onClick="serverMode(false)" <TMPL_IF NAME="Security_If_Local">checked</TMPL_IF> /> <label class="administrationLabel" for="StealthMode"> Stealth Mode (disable remote connections) </label> <br /> ! <input type="radio" name="servermode" id="ServerMode" value="ServerMode" onClick="serverMode(true)" <TMPL_IF NAME="Security_If_Local"><TMPL_ELSE>checked</TMPL_IF> /> <label class="administrationLabel" for="ServerMode"> Server Mode (allow remote connections) *************** *** 36,46 **** <br /> <div style="margin-left:1em;" class="adminAcceptRemote"> ! <input type="checkbox" name="serveropt_http" id="securityAcceptHTTP" name="toggle" /> ! <label class="administrationLabel" for="securityAcceptHTTP"> ! <TMPL_VAR NAME="Localize_Security_UI"> ! </label> ! <br /> ! <TMPL_VAR NAME="Security_Dynamic_Security"> </div> --- 36,46 ---- <br /> <div style="margin-left:1em;" class="adminAcceptRemote"> ! <input type="checkbox" name="serveropt_http" id="securityAcceptHTTP" name="toggle" <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> /> ! <label class="administrationLabel" for="securityAcceptHTTP"> ! <TMPL_VAR NAME="Localize_Security_UI"> ! </label> ! <br /> ! <TMPL_VAR NAME="Security_Dynamic_Security"> </div> *************** *** 49,53 **** <TMPL_INCLUDE NAME="windows-configuration.thtml"> ! <br /> <input type="submit" class="submit" name="apply_operation" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> --- 49,53 ---- <TMPL_INCLUDE NAME="windows-configuration.thtml"> ! <br /><br /> <input type="submit" class="submit" name="apply_operation" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> *************** *** 66,150 **** <h2 class="configuration"><TMPL_VAR NAME="Localize_Security_UpdateTitle"></h2> <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="securityLabel"> ! <TMPL_VAR NAME="Localize_Security_Update">: ! </div> ! ! <TMPL_IF NAME="Security_If_Update_Check"> ! ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input type="submit" class="submit toggleOff" id="securityUpdateCheckOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> ! <input type="hidden" name="update_check" value="1" /> ! ! <TMPL_ELSE> ! ! <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span> ! <input type="submit" class="submit toggleOn" id="securityUpdateCheckOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="update_check" value="2" /> ! ! </TMPL_IF> ! </form> - <i><TMPL_VAR NAME="Localize_Security_ExplainUpdate"></i> <hr /> </div> - <div class="securityStatsWidget"> - <h2 class="configuration"><TMPL_VAR NAME="Localize_Security_StatsTitle"></h2> - <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> - <div class="securityLabel"> - <TMPL_VAR NAME="Localize_Security_Stats">: - </div> - - <TMPL_IF NAME="Security_If_Send_Stats"> - - <span class="securityWidgetStateOn"> - <TMPL_VAR NAME="Localize_Yes"> - </span> - <input type="submit" class="submit toggleOff" id="securitySendStatsOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> - <input type="hidden" name="send_stats" value="1" /> - - <TMPL_ELSE> - - <span class="securityWidgetStateOff"> - <TMPL_VAR NAME="Localize_No"> - </span> - <input type="submit" class="submit toggleOn" id="securitySendStatsOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> - <input type="hidden" name="send_stats" value="2" /> - - </TMPL_IF> - - </form> - <i><TMPL_VAR NAME="Localize_Security_ExplainStats"></i> - <hr /> - </div> - - <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_TCPTimeout"></h2> - <form action="/administration" method="post"> - <label class="configurationLabel" for="configTCPTimeout"> - <TMPL_VAR NAME="Localize_Configuration_TCPTimeoutSecs">: - </label> - <br /> - <input name="timeout" type="text" id="configTCPTimeout" value="<TMPL_VAR NAME="Configuration_TCP_Timeout">" /> - <input type="submit" class="submit" name="update_timeout" value="<TMPL_VAR NAME="Localize_Apply">" /> - </form> - - <TMPL_IF NAME="Configuration_If_TCP_Timeout_Error"> - - <blockquote> - <div class="error01"> - <TMPL_VAR NAME="Localize_Configuration_Error6"> - </div> - </blockquote> - - </TMPL_IF> - - <TMPL_VAR NAME="Configuration_TCP_Timeout_Updated"> - <hr /> - <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_Logging"></h2> <form action="/administration" method="post"> ! <label class="configurationLabel" for="configLogging"> <TMPL_VAR NAME="Localize_Configuration_LoggerOutput">: </label> --- 66,89 ---- <h2 class="configuration"><TMPL_VAR NAME="Localize_Security_UpdateTitle"></h2> <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input type="checkbox" id="securityUpdateCheck" name="update_check" <TMPL_IF NAME="Security_If_Update_Check">checked</TMPL_IF> /> ! <label class="administrationLabel" for="securityUpdateCheck"> ! <TMPL_VAR NAME="Localize_Security_Update"> ! </label> ! <br /> ! <input type="checkbox" id="securitySendStats" name="update_check" <TMPL_IF NAME="Security_If_Send_Stats">checked</TMPL_IF> /> ! <label class="administrationLabel" for="securitySendStats"> ! <TMPL_VAR NAME="Localize_Security_Stats"> ! </label> ! <br /><br /> ! <input type="submit" class="submit" name="privacy" value="<TMPL_VAR NAME="Localize_Apply">" /> ! <br /><br /> ! <i><TMPL_VAR NAME="Localize_Security_ExplainUpdate"></i> </form> <hr /> </div> <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_Logging"></h2> <form action="/administration" method="post"> ! <label class="administrationLabel" for="configLogging"> <TMPL_VAR NAME="Localize_Configuration_LoggerOutput">: </label> *************** *** 164,167 **** --- 103,123 ---- </option> </select> + <br /> + <label class="administrationLabel" for="configLoggingLevel"> + Logger level: + </label> + + <select name="level" id="configLoggingLevel"> + <option value="0" > + Low + </option> + <option value="1" > + Default + </option> + <option value="2" > + High + </option> + </select> + <br /><br /> <input type="submit" class="submit" name="submit_debug" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> *************** *** 169,175 **** <TMPL_IF NAME="Configuration_If_Show_Log"> ! <p> ! <a href="popfile_current_log.log" class="downloadLogLink"><TMPL_VAR NAME="Localize_Configuration_CurrentLogFile"></a> ! </p> </TMPL_IF> --- 125,130 ---- <TMPL_IF NAME="Configuration_If_Show_Log"> ! <br /> ! <a href="popfile_current_log.log" class="downloadLogLink"><TMPL_VAR NAME="Localize_Configuration_CurrentLogFile"></a> </TMPL_IF> *************** *** 184,188 **** <br /> <input name="ui_port" id="configUIPort" type="text" value="<TMPL_VAR NAME="Configuration_UI_Port">" /> ! <input type="submit" class="submit" name="update_ui_port" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> --- 139,164 ---- <br /> <input name="ui_port" id="configUIPort" type="text" value="<TMPL_VAR NAME="Configuration_UI_Port">" /> ! <br /> ! ! <label class="configurationLabel" for="configTCPTimeout"> ! <TMPL_VAR NAME="Localize_Configuration_TCPTimeoutSecs">: ! </label> ! <br /> ! <input name="timeout" type="text" id="configTCPTimeout" value="<TMPL_VAR NAME="Configuration_TCP_Timeout">" /> ! ! <TMPL_IF NAME="Configuration_If_TCP_Timeout_Error"> ! ! <blockquote> ! <div class="error01"> ! <TMPL_VAR NAME="Localize_Configuration_Error6"> ! </div> ! </blockquote> ! ! </TMPL_IF> ! ! <TMPL_VAR NAME="Configuration_TCP_Timeout_Updated"> ! ! <br /><br /> ! <input type="submit" class="submit" name="update_modules" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> Index: smtp-security-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-security-local.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** smtp-security-local.thtml 2 Mar 2006 11:17:00 -0000 1.6 --- smtp-security-local.thtml 3 Mar 2006 09:55:49 -0000 1.7 *************** *** 1,3 **** ! <input type="checkbox" name="serveropt_smtp" id="securityAcceptSMTP" <TMPL_IF NAME="smtp_local_on"><TMPL_ELSE>checked</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptSMTP"> <TMPL_VAR NAME="Localize_Security_SMTP"> --- 1,3 ---- ! <input type="checkbox" name="serveropt_smtp" id="securityAcceptSMTP" <TMPL_IF NAME="smtp_local_on"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptSMTP"> <TMPL_VAR NAME="Localize_Security_SMTP"> |
