# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: D:\Work\Java\Open_Source\xwiki-trunks\xwiki-platform-web\standard\src\main\webapp\templates # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: adminprefs.vm --- adminprefs.vm Base (BASE) +++ adminprefs.vm Locally Modified (Based On LOCAL) @@ -5,7 +5,7 @@ ## ## Define sections ## -#set($sections = ["params", "skin", "presentation", "editing", "advanced", "registration"]) +#set($sections = ["params", "skin", "presentation", "editing", "advanced", "registration", "mail"]) #set($sectionitemsmap = $util.hashMap) #set($sectionitemsmap.params = ["multilingual", "languages" , "default_language", "authenticate_view", "authenticate_edit", "auth_active_check" ]) ## #set($sectionitemsmap.skin = ["skin", "stylesheet", "stylesheets", "leftPanels", "rightPanels", "showLeftPanels", "showRightPanels", "pageWidth"]) @@ -13,7 +13,8 @@ #set($sectionitemsmap.presentation = [ "title", "version", "webcopyright", "meta" ]) #set($sectionitemsmap.editing = ["editor", "editbox_width","editbox_height"]) #set($sectionitemsmap.advanced = ["macros_languages", "macros_velocity","macros_groovy", "macros_mapping", "notification_pages", "documentBundles" ]) -#set($sectionitemsmap.registration = [ "use_email_verification", "admin_email", "smtp_server", "validation_email_content", "confirmation_email_content", "invitation_email_content"]) \ No newline at end of file +#set($sectionitemsmap.registration = [ "use_email_verification", "validation_email_subject", "validation_email_content", "confirmation_email_subject", "confirmation_email_content", "invitation_email_subject", "invitation_email_content"]) +#set($sectionitemsmap.mail = ["admin_email", "default_email_subject", "smtp_server", "smtp_server_username", "smtp_server_password", "javamail_extra_props"]) \ No newline at end of file ## ## Define the macro that displays the options in a category ##