From 59e420e50397ed6661692abc39307ce39221efc8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Mon, 28 Dec 2009 15:48:12 +0000 Subject: [PATCH] * reorganize some templates into subdirectories * addopt new template names Thats the move list: display_aide_menu.html aide/display_menu.html aide_display_menu display_ignet_confirmdelete.html aide/ignetconf/display_confirm_delete.html aide_ignetconf_display_confirm_delete edit_node.html aide/ignetconf/edit_node.html aide_ignetconf_edit_node section_ignetconf.html aide/ignetconf/section.html aide_ignetconf_section add_node.html aide/ignetconf/add.html aide_ignetconf_add display_netconf.html aide/display_ignetconf.html aide_display_ignetconf display_sitewide_config.html aide aide_display_sitewide_config tab_siteconfig_access.html aide/siteconfig/tab_access.html aide_siteconfig_tab_access tab_siteconfig_autopurger.html aide/siteconfig/tab_autopurger.html aide_siteconfig_tab_autopurger tab_siteconfig_directory.html aide/siteconfig/tab_directory.html aide_siteconfig_tab_directory tab_siteconfig_general.html aide/siteconfig/tab_general.html aide_siteconfig_tab_general tab_siteconfig_indexing.html aide/siteconfig/tab_indexing.html aide_siteconfig_tab_indexing tab_siteconfig_network.html aide/siteconfig/tab_network.html aide_siteconfig_tab_network tab_siteconfig_pop3.html aide/siteconfig/tab_pop3.html aide_siteconfig_tab_pop3 tab_siteconfig_pushmail.html aide/siteconfig/tab_pushmail.html aide_siteconfig_tab_pushmail tab_siteconfig_tuning.html aide/siteconfig/tab_tuning.html aide_siteconfig_tab_tuning siteconfig_tzsection.html aide/siteconfig/tzsection.html aide_siteconfig_tzsection submit_siteconfig.html aide/siteconfig/submit.html aide_siteconfig_submit aide_inetconf.html aide/display_inetconf.html aide_display_inetconf aide_inet_aliases.html aide/inet/aliases.html aide_inet_clamav.html aide/inet/clamav.html aide_inet_dirnames.html aide/inet/dirnames.html aide_inet_fallbackhosts.html aide/inet/fallbackhosts.html aide_inet_masqdomains.html aide/inet/masqdomains.html aide_inet_notify.html aide/inet/notify.html aide_inet_rbldns.html aide/inet/rbldns.html aide_inet_smarthosts.html aide/inet/smarthosts.html aide_inet_spamass.html aide/inet/spamass.html page_now.html paging/now.html paging_now paging_anchor.html paging/anchor.html paging_anchor paging_failed_hook.html paging/failed_hook.html paging_failed_hook display_serverrestartpage.html aide/display_serverrestart_page.html aide_display_serverrestart_page display_serverrestart.html aide display_serverrestartpagedo.html aide/display_serverrestart_page_do.html box_serverrestart.html aide/serverrestart/box.html box_serverrestartpage.html aide/serverrestart/box_page.html box_serverrestartpagedo.html aide/serverrestart/box_page_do.html section_files_onefile.html files/section_onefile.html files_section_onefile files_jspicview.html files/picview.js pushemail.html prefs/pushemail.html prefs_pushemail section_userlist_select.html aide/edituser/section.html edituser_select.html aide/edituser/select.html aide_edituser_select edituser_add.html aide/edituser/add.html aide_edituser_add userlist_detailview.html aide/edituser/detailview.html aide_edituser_detailview wholist_section.html who/iconbar.html who_iconbar whosimplesection.html who/iconbar_section.html who_iconbar_section wholiststatic_header.html who/list_static_header.html wholiststatic.html who/box_list_static.html wholistsummarysection.html who/summary.html who_summary whosummarysection.html who/summary_section.html who_summary_section whosection.html who/bla_list_section.html --- webcit/mainmenu.c | 8 ++++---- webcit/pushemail.c | 2 +- .../display_ignetconf.html} | 4 ++-- .../display_inetconf.html} | 0 .../display_menu.html} | 0 .../t/{ => aide}/display_serverrestart.html | 4 ++-- .../display_serverrestart_page.html} | 0 .../display_serverrestart_page_do.html} | 0 .../t/{ => aide}/display_sitewide_config.html | 20 +++++++++---------- .../edituser/add.html} | 0 .../edituser/box_select.html} | 0 .../edituser/detailview.html} | 0 .../edituser/section.html} | 0 .../edituser/select.html} | 4 ++-- .../floorconfig.html} | 0 webcit/static/t/aide/global_config.html | 6 ++++++ .../ignetconf/add.html} | 4 ++-- .../ignetconf/display_confirm_delete.html} | 4 ++-- .../t/{ => aide/ignetconf}/edit_node.html | 2 +- webcit/static/t/aide/ignetconf/section.html | 6 ++++++ .../inet/aliases.html} | 4 ++-- .../inet/clamav.html} | 2 +- .../inet/dirnames.html} | 4 ++-- .../inet/fallbackhosts.html} | 4 ++-- .../inet/masqdomains.html} | 4 ++-- .../inet/notify.html} | 4 ++-- .../inet/rbldns.html} | 4 ++-- webcit/static/t/aide/inet/section.html | 5 +++++ .../inet/smarthosts.html} | 4 ++-- .../inet/spamass.html} | 4 ++-- .../{aide_restart.html => aide/restart.html} | 0 .../serverrestart/box.html} | 0 .../serverrestart/box_page.html} | 0 .../serverrestart/box_page_do.html} | 0 .../siteconfig/submit.html} | 0 .../siteconfig/tab_access.html} | 0 .../siteconfig/tab_autopurger.html} | 0 .../siteconfig/tab_directory.html} | 0 .../siteconfig/tab_general.html} | 2 +- .../siteconfig/tab_indexing.html} | 0 .../siteconfig/tab_network.html} | 0 .../siteconfig/tab_pop3.html} | 0 .../siteconfig/tab_pushmail.html} | 0 .../siteconfig/tab_tuning.html} | 0 .../siteconfig/tzsection.html} | 0 .../usermanagement.html} | 0 webcit/static/t/aide_global_config.html | 6 ------ webcit/static/t/edit_message.html | 8 ++++---- .../section_attach_select.html | 0 webcit/static/t/files.html | 2 +- .../picview.js} | 0 .../section_onefile.html} | 0 .../section_onefile_picview.html} | 0 webcit/static/t/iconbar.html | 2 +- .../{iconbar_edit.html => iconbar/edit.html} | 0 .../{iconbar_save.html => iconbar/save.html} | 0 .../t/{iconbar_user.css => iconbar/user.css} | 0 .../t/{json_floor.html => json/floor.html} | 0 .../t/{json_floors.html => json/floors.html} | 0 .../t/{json_lkra.html => json/lkra.html} | 0 .../t/{json_room.html => json/room.html} | 0 .../{json_roomflr.html => json/roomflr.html} | 0 .../advanced_roomcommands.html} | 0 .../basic_commands.html} | 0 .../your_info.html} | 2 +- webcit/static/t/paging.html | 2 +- .../anchor.html} | 0 .../failed_hook.html} | 0 .../t/{page_now.html => paging/now.html} | 0 webcit/static/t/preferences.html | 2 +- .../{box_preferences.html => prefs/box.html} | 6 +++--- webcit/static/t/{ => prefs}/pushemail.html | 0 .../section_msg_handle_select.html | 0 .../section_msg_sender_from_select.html | 0 .../section_msg_sender_name_select.html | 0 .../static/t/section_aide_inetconf_entry.html | 5 ----- webcit/static/t/section_ignetconf.html | 6 ------ webcit/static/t/subject_aiderestart.html | 1 - webcit/static/t/subject_floorconfig.html | 1 - webcit/static/t/subject_inet_aliases.html | 1 - webcit/static/t/subject_pushmail.html | 1 - webcit/static/t/subject_tuning.html | 1 - .../inline_attach.html} | 0 .../list_attach.html} | 0 .../print.html} | 0 .../replyquote.html} | 0 .../wikiedit.html} | 0 webcit/static/t/who.html | 2 +- .../box_list_static.html} | 2 +- webcit/static/t/who/iconbar.html | 1 + .../iconbar_section.html} | 0 .../list_static_header.html} | 0 .../t/{whosection.html => who/section.html} | 0 .../summary.html} | 2 +- .../summary_section.html} | 0 webcit/static/t/wholist_section.html | 1 - .../{wiki_history.html => wiki/history.html} | 0 .../history_inner.html} | 0 .../pagelist.html} | 0 .../pagelist_inner.html} | 0 webcit/static/wclib.js | 2 +- webcit/summary.c | 4 ++-- 102 files changed, 80 insertions(+), 85 deletions(-) rename webcit/static/t/{display_netconf.html => aide/display_ignetconf.html} (74%) rename webcit/static/t/{aide_inetconf.html => aide/display_inetconf.html} (100%) rename webcit/static/t/{display_aide_menu.html => aide/display_menu.html} (100%) rename webcit/static/t/{ => aide}/display_serverrestart.html (94%) rename webcit/static/t/{display_serverrestartpage.html => aide/display_serverrestart_page.html} (100%) rename webcit/static/t/{display_serverrestartpagedo.html => aide/display_serverrestart_page_do.html} (100%) rename webcit/static/t/{ => aide}/display_sitewide_config.html (50%) rename webcit/static/t/{edituser_add.html => aide/edituser/add.html} (100%) rename webcit/static/t/{box_edituser_select.html => aide/edituser/box_select.html} (100%) rename webcit/static/t/{userlist_detailview.html => aide/edituser/detailview.html} (100%) rename webcit/static/t/{section_userlist_select.html => aide/edituser/section.html} (100%) rename webcit/static/t/{edituser_select.html => aide/edituser/select.html} (82%) rename webcit/static/t/{aide_floorconfig.html => aide/floorconfig.html} (100%) create mode 100644 webcit/static/t/aide/global_config.html rename webcit/static/t/{add_node.html => aide/ignetconf/add.html} (87%) rename webcit/static/t/{display_ignet_confirmdelete.html => aide/ignetconf/display_confirm_delete.html} (62%) rename webcit/static/t/{ => aide/ignetconf}/edit_node.html (93%) create mode 100644 webcit/static/t/aide/ignetconf/section.html rename webcit/static/t/{aide_inet_aliases.html => aide/inet/aliases.html} (76%) rename webcit/static/t/{aide_inet_clamav.html => aide/inet/clamav.html} (88%) rename webcit/static/t/{aide_inet_dirnames.html => aide/inet/dirnames.html} (76%) rename webcit/static/t/{aide_inet_fallbackhosts.html => aide/inet/fallbackhosts.html} (77%) rename webcit/static/t/{aide_inet_masqdomains.html => aide/inet/masqdomains.html} (76%) rename webcit/static/t/{aide_inet_notify.html => aide/inet/notify.html} (80%) rename webcit/static/t/{aide_inet_rbldns.html => aide/inet/rbldns.html} (77%) create mode 100644 webcit/static/t/aide/inet/section.html rename webcit/static/t/{aide_inet_smarthosts.html => aide/inet/smarthosts.html} (77%) rename webcit/static/t/{aide_inet_spamass.html => aide/inet/spamass.html} (76%) rename webcit/static/t/{aide_restart.html => aide/restart.html} (100%) rename webcit/static/t/{box_serverrestart.html => aide/serverrestart/box.html} (100%) rename webcit/static/t/{box_serverrestartpage.html => aide/serverrestart/box_page.html} (100%) rename webcit/static/t/{box_serverrestartpagedo.html => aide/serverrestart/box_page_do.html} (100%) rename webcit/static/t/{submit_siteconfig.html => aide/siteconfig/submit.html} (100%) rename webcit/static/t/{tab_siteconfig_access.html => aide/siteconfig/tab_access.html} (100%) rename webcit/static/t/{tab_siteconfig_autopurger.html => aide/siteconfig/tab_autopurger.html} (100%) rename webcit/static/t/{tab_siteconfig_directory.html => aide/siteconfig/tab_directory.html} (100%) rename webcit/static/t/{tab_siteconfig_general.html => aide/siteconfig/tab_general.html} (96%) rename webcit/static/t/{tab_siteconfig_indexing.html => aide/siteconfig/tab_indexing.html} (100%) rename webcit/static/t/{tab_siteconfig_network.html => aide/siteconfig/tab_network.html} (100%) rename webcit/static/t/{tab_siteconfig_pop3.html => aide/siteconfig/tab_pop3.html} (100%) rename webcit/static/t/{tab_siteconfig_pushmail.html => aide/siteconfig/tab_pushmail.html} (100%) rename webcit/static/t/{tab_siteconfig_tuning.html => aide/siteconfig/tab_tuning.html} (100%) rename webcit/static/t/{siteconfig_tzsection.html => aide/siteconfig/tzsection.html} (100%) rename webcit/static/t/{aide_usermanagement.html => aide/usermanagement.html} (100%) delete mode 100644 webcit/static/t/aide_global_config.html rename webcit/static/t/{ => edit_message}/section_attach_select.html (100%) rename webcit/static/t/{files_jspicview.html => files/picview.js} (100%) rename webcit/static/t/{section_files_onefile.html => files/section_onefile.html} (100%) rename webcit/static/t/{section_files_onefile_picview.html => files/section_onefile_picview.html} (100%) rename webcit/static/t/{iconbar_edit.html => iconbar/edit.html} (100%) rename webcit/static/t/{iconbar_save.html => iconbar/save.html} (100%) rename webcit/static/t/{iconbar_user.css => iconbar/user.css} (100%) rename webcit/static/t/{json_floor.html => json/floor.html} (100%) rename webcit/static/t/{json_floors.html => json/floors.html} (100%) rename webcit/static/t/{json_lkra.html => json/lkra.html} (100%) rename webcit/static/t/{json_room.html => json/room.html} (100%) rename webcit/static/t/{json_roomflr.html => json/roomflr.html} (100%) rename webcit/static/t/{menu_advanced_roomcommands.html => menu/advanced_roomcommands.html} (100%) rename webcit/static/t/{menu_basic_commands.html => menu/basic_commands.html} (100%) rename webcit/static/t/{menu_your_info.html => menu/your_info.html} (87%) rename webcit/static/t/{paging_anchor.html => paging/anchor.html} (100%) rename webcit/static/t/{paging_failed_hook.html => paging/failed_hook.html} (100%) rename webcit/static/t/{page_now.html => paging/now.html} (100%) rename webcit/static/t/{box_preferences.html => prefs/box.html} (98%) rename webcit/static/t/{ => prefs}/pushemail.html (100%) rename webcit/static/t/{ => prefs}/section_msg_handle_select.html (100%) rename webcit/static/t/{ => prefs}/section_msg_sender_from_select.html (100%) rename webcit/static/t/{ => prefs}/section_msg_sender_name_select.html (100%) delete mode 100644 webcit/static/t/section_aide_inetconf_entry.html delete mode 100644 webcit/static/t/section_ignetconf.html delete mode 100644 webcit/static/t/subject_aiderestart.html delete mode 100644 webcit/static/t/subject_floorconfig.html delete mode 100644 webcit/static/t/subject_inet_aliases.html delete mode 100644 webcit/static/t/subject_pushmail.html delete mode 100644 webcit/static/t/subject_tuning.html rename webcit/static/t/{view_message_inline_attach.html => view_message/inline_attach.html} (100%) rename webcit/static/t/{view_message_list_attach.html => view_message/list_attach.html} (100%) rename webcit/static/t/{view_message_print.html => view_message/print.html} (100%) rename webcit/static/t/{view_message_replyquote.html => view_message/replyquote.html} (100%) rename webcit/static/t/{view_message_wikiedit.html => view_message/wikiedit.html} (100%) rename webcit/static/t/{wholiststatic.html => who/box_list_static.html} (92%) create mode 100644 webcit/static/t/who/iconbar.html rename webcit/static/t/{whosimplesection.html => who/iconbar_section.html} (100%) rename webcit/static/t/{wholiststatic_header.html => who/list_static_header.html} (100%) rename webcit/static/t/{whosection.html => who/section.html} (100%) rename webcit/static/t/{wholistsummarysection.html => who/summary.html} (72%) rename webcit/static/t/{whosummarysection.html => who/summary_section.html} (100%) delete mode 100644 webcit/static/t/wholist_section.html rename webcit/static/t/{wiki_history.html => wiki/history.html} (100%) rename webcit/static/t/{wiki_history_inner.html => wiki/history_inner.html} (100%) rename webcit/static/t/{wiki_pagelist.html => wiki/pagelist.html} (100%) rename webcit/static/t/{wiki_pagelist_inner.html => wiki/pagelist_inner.html} (100%) diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c index da400fc90..b2831714b 100644 --- a/webcit/mainmenu.c +++ b/webcit/mainmenu.c @@ -23,7 +23,7 @@ void display_aide_menu(void) { begin_burst(); output_headers(1, 0, 0, 0, 1, 0); - DoTemplate(HKEY("display_aide_menu"), NULL, &NoCtx); + DoTemplate(HKEY("aide_display_menu"), NULL, &NoCtx); end_burst(); } @@ -214,7 +214,7 @@ void display_shutdown(void) { begin_burst(); output_headers(1, 0, 0, 0, 1, 0); - DoTemplate(HKEY("display_serverrestartpage"), NULL, &NoCtx); + DoTemplate(HKEY("aide_display_serverrestart_page"), NULL, &NoCtx); end_burst(); } else @@ -223,7 +223,7 @@ void display_shutdown(void) serv_getln(buf, sizeof buf); /* TODO: should we care? */ begin_burst(); output_headers(1, 0, 0, 0, 1, 0); - DoTemplate(HKEY("display_serverrestartpagedo"), NULL, &NoCtx); + DoTemplate(HKEY("aide_display_serverrestart_page"), NULL, &NoCtx); end_burst(); } } @@ -239,7 +239,7 @@ void display_shutdown(void) } begin_burst(); output_headers(1, 0, 0, 0, 1, 0); - DoTemplate(HKEY("display_aide_menu"), NULL, &NoCtx); + DoTemplate(HKEY("aide_display_menu"), NULL, &NoCtx); end_burst(); } } diff --git a/webcit/pushemail.c b/webcit/pushemail.c index 54dbf63b3..586fca67e 100644 --- a/webcit/pushemail.c +++ b/webcit/pushemail.c @@ -85,7 +85,7 @@ void display_pushemail(void) GetServerStatus(Buf, NULL); } output_headers(1, 1, 2, 0, 0, 0); - DoTemplate(HKEY("pushemail"), NULL, &SubTP); + DoTemplate(HKEY("prefs_pushemail"), NULL, &SubTP); wDumpContent(1); FreeStrBuf(&Buf); } diff --git a/webcit/static/t/display_netconf.html b/webcit/static/t/aide/display_ignetconf.html similarity index 74% rename from webcit/static/t/display_netconf.html rename to webcit/static/t/aide/display_ignetconf.html index 887b81839..c89c86ae6 100644 --- a/webcit/static/t/display_netconf.html +++ b/webcit/static/t/aide/display_ignetconf.html @@ -7,7 +7,7 @@
-
+
@@ -15,7 +15,7 @@
- +
diff --git a/webcit/static/t/aide_inetconf.html b/webcit/static/t/aide/display_inetconf.html similarity index 100% rename from webcit/static/t/aide_inetconf.html rename to webcit/static/t/aide/display_inetconf.html diff --git a/webcit/static/t/display_aide_menu.html b/webcit/static/t/aide/display_menu.html similarity index 100% rename from webcit/static/t/display_aide_menu.html rename to webcit/static/t/aide/display_menu.html diff --git a/webcit/static/t/display_serverrestart.html b/webcit/static/t/aide/display_serverrestart.html similarity index 94% rename from webcit/static/t/display_serverrestart.html rename to webcit/static/t/aide/display_serverrestart.html index 8d56e41a5..e96d1f070 100644 --- a/webcit/static/t/display_serverrestart.html +++ b/webcit/static/t/aide/display_serverrestart.html @@ -18,7 +18,7 @@ - +
@@ -27,6 +27,6 @@
- +
diff --git a/webcit/static/t/display_serverrestartpage.html b/webcit/static/t/aide/display_serverrestart_page.html similarity index 100% rename from webcit/static/t/display_serverrestartpage.html rename to webcit/static/t/aide/display_serverrestart_page.html diff --git a/webcit/static/t/display_serverrestartpagedo.html b/webcit/static/t/aide/display_serverrestart_page_do.html similarity index 100% rename from webcit/static/t/display_serverrestartpagedo.html rename to webcit/static/t/aide/display_serverrestart_page_do.html diff --git a/webcit/static/t/display_sitewide_config.html b/webcit/static/t/aide/display_sitewide_config.html similarity index 50% rename from webcit/static/t/display_sitewide_config.html rename to webcit/static/t/aide/display_sitewide_config.html index 67cb078d0..9bcf8784f 100644 --- a/webcit/static/t/display_sitewide_config.html +++ b/webcit/static/t/aide/display_sitewide_config.html @@ -8,16 +8,16 @@
- +
diff --git a/webcit/static/t/edituser_add.html b/webcit/static/t/aide/edituser/add.html similarity index 100% rename from webcit/static/t/edituser_add.html rename to webcit/static/t/aide/edituser/add.html diff --git a/webcit/static/t/box_edituser_select.html b/webcit/static/t/aide/edituser/box_select.html similarity index 100% rename from webcit/static/t/box_edituser_select.html rename to webcit/static/t/aide/edituser/box_select.html diff --git a/webcit/static/t/userlist_detailview.html b/webcit/static/t/aide/edituser/detailview.html similarity index 100% rename from webcit/static/t/userlist_detailview.html rename to webcit/static/t/aide/edituser/detailview.html diff --git a/webcit/static/t/section_userlist_select.html b/webcit/static/t/aide/edituser/section.html similarity index 100% rename from webcit/static/t/section_userlist_select.html rename to webcit/static/t/aide/edituser/section.html diff --git a/webcit/static/t/edituser_select.html b/webcit/static/t/aide/edituser/select.html similarity index 82% rename from webcit/static/t/edituser_select.html rename to webcit/static/t/aide/edituser/select.html index b10184565..1770cc86f 100644 --- a/webcit/static/t/edituser_select.html +++ b/webcit/static/t/aide/edituser/select.html @@ -14,9 +14,9 @@
- + - +
diff --git a/webcit/static/t/aide_floorconfig.html b/webcit/static/t/aide/floorconfig.html similarity index 100% rename from webcit/static/t/aide_floorconfig.html rename to webcit/static/t/aide/floorconfig.html diff --git a/webcit/static/t/aide/global_config.html b/webcit/static/t/aide/global_config.html new file mode 100644 index 000000000..fb11d1a0d --- /dev/null +++ b/webcit/static/t/aide/global_config.html @@ -0,0 +1,6 @@ +
    +
    • +
    • +
    • +
    • +
diff --git a/webcit/static/t/add_node.html b/webcit/static/t/aide/ignetconf/add.html similarity index 87% rename from webcit/static/t/add_node.html rename to webcit/static/t/aide/ignetconf/add.html index ceb1dc417..ace8e08b4 100644 --- a/webcit/static/t/add_node.html +++ b/webcit/static/t/aide/ignetconf/add.html @@ -7,9 +7,9 @@
-
+ - +
diff --git a/webcit/static/t/display_ignet_confirmdelete.html b/webcit/static/t/aide/ignetconf/display_confirm_delete.html similarity index 62% rename from webcit/static/t/display_ignet_confirmdelete.html rename to webcit/static/t/aide/ignetconf/display_confirm_delete.html index d5833ee4a..1817c6eb5 100644 --- a/webcit/static/t/display_ignet_confirmdelete.html +++ b/webcit/static/t/aide/ignetconf/display_confirm_delete.html @@ -11,7 +11,7 @@ -&index="> +&index=">     -
+
diff --git a/webcit/static/t/edit_node.html b/webcit/static/t/aide/ignetconf/edit_node.html similarity index 93% rename from webcit/static/t/edit_node.html rename to webcit/static/t/aide/ignetconf/edit_node.html index c32ec5d5d..ac58879c6 100644 --- a/webcit/static/t/edit_node.html +++ b/webcit/static/t/aide/ignetconf/edit_node.html @@ -9,7 +9,7 @@
- +
diff --git a/webcit/static/t/aide/ignetconf/section.html b/webcit/static/t/aide/ignetconf/section.html new file mode 100644 index 000000000..b67b73379 --- /dev/null +++ b/webcit/static/t/aide/ignetconf/section.html @@ -0,0 +1,6 @@ + + + + diff --git a/webcit/static/t/aide_inet_aliases.html b/webcit/static/t/aide/inet/aliases.html similarity index 76% rename from webcit/static/t/aide_inet_aliases.html rename to webcit/static/t/aide/inet/aliases.html index 76a2be25c..87b82afc4 100644 --- a/webcit/static/t/aide_inet_aliases.html +++ b/webcit/static/t/aide/inet/aliases.html @@ -2,7 +2,7 @@
+ +&index=">
- +
@@ -10,5 +10,5 @@ - +
diff --git a/webcit/static/t/aide_inet_clamav.html b/webcit/static/t/aide/inet/clamav.html similarity index 88% rename from webcit/static/t/aide_inet_clamav.html rename to webcit/static/t/aide/inet/clamav.html index 2dc2aceed..459ba5c4c 100644 --- a/webcit/static/t/aide_inet_clamav.html +++ b/webcit/static/t/aide/inet/clamav.html @@ -10,5 +10,5 @@ - + diff --git a/webcit/static/t/aide_inet_dirnames.html b/webcit/static/t/aide/inet/dirnames.html similarity index 76% rename from webcit/static/t/aide_inet_dirnames.html rename to webcit/static/t/aide/inet/dirnames.html index 04d28b917..1ae2c6ba8 100644 --- a/webcit/static/t/aide_inet_dirnames.html +++ b/webcit/static/t/aide/inet/dirnames.html @@ -2,7 +2,7 @@
- +
@@ -10,5 +10,5 @@ - +
diff --git a/webcit/static/t/aide_inet_fallbackhosts.html b/webcit/static/t/aide/inet/fallbackhosts.html similarity index 77% rename from webcit/static/t/aide_inet_fallbackhosts.html rename to webcit/static/t/aide/inet/fallbackhosts.html index a2b190b1b..44ea19b90 100644 --- a/webcit/static/t/aide_inet_fallbackhosts.html +++ b/webcit/static/t/aide/inet/fallbackhosts.html @@ -2,7 +2,7 @@
- +
@@ -10,5 +10,5 @@ - +
diff --git a/webcit/static/t/aide_inet_masqdomains.html b/webcit/static/t/aide/inet/masqdomains.html similarity index 76% rename from webcit/static/t/aide_inet_masqdomains.html rename to webcit/static/t/aide/inet/masqdomains.html index 08390f4b2..8434fdaa2 100644 --- a/webcit/static/t/aide_inet_masqdomains.html +++ b/webcit/static/t/aide/inet/masqdomains.html @@ -2,7 +2,7 @@
- +
@@ -10,5 +10,5 @@ - +
diff --git a/webcit/static/t/aide_inet_notify.html b/webcit/static/t/aide/inet/notify.html similarity index 80% rename from webcit/static/t/aide_inet_notify.html rename to webcit/static/t/aide/inet/notify.html index b7708f50a..ff3b99895 100644 --- a/webcit/static/t/aide_inet_notify.html +++ b/webcit/static/t/aide/inet/notify.html @@ -2,7 +2,7 @@
- +
@@ -10,5 +10,5 @@ - +
diff --git a/webcit/static/t/aide_inet_rbldns.html b/webcit/static/t/aide/inet/rbldns.html similarity index 77% rename from webcit/static/t/aide_inet_rbldns.html rename to webcit/static/t/aide/inet/rbldns.html index b1f5b5fc3..b6d2a97d0 100644 --- a/webcit/static/t/aide_inet_rbldns.html +++ b/webcit/static/t/aide/inet/rbldns.html @@ -2,7 +2,7 @@
- +
@@ -10,5 +10,5 @@ - +
diff --git a/webcit/static/t/aide/inet/section.html b/webcit/static/t/aide/inet/section.html new file mode 100644 index 000000000..4ca3a0c84 --- /dev/null +++ b/webcit/static/t/aide/inet/section.html @@ -0,0 +1,5 @@ + + + +')" > + diff --git a/webcit/static/t/aide_inet_smarthosts.html b/webcit/static/t/aide/inet/smarthosts.html similarity index 77% rename from webcit/static/t/aide_inet_smarthosts.html rename to webcit/static/t/aide/inet/smarthosts.html index cb77afc6b..23d5fa6a8 100644 --- a/webcit/static/t/aide_inet_smarthosts.html +++ b/webcit/static/t/aide/inet/smarthosts.html @@ -2,7 +2,7 @@
- +
@@ -10,5 +10,5 @@ - +
diff --git a/webcit/static/t/aide_inet_spamass.html b/webcit/static/t/aide/inet/spamass.html similarity index 76% rename from webcit/static/t/aide_inet_spamass.html rename to webcit/static/t/aide/inet/spamass.html index eecf25081..041db6d27 100644 --- a/webcit/static/t/aide_inet_spamass.html +++ b/webcit/static/t/aide/inet/spamass.html @@ -2,7 +2,7 @@
- +
@@ -10,5 +10,5 @@ - +
diff --git a/webcit/static/t/aide_restart.html b/webcit/static/t/aide/restart.html similarity index 100% rename from webcit/static/t/aide_restart.html rename to webcit/static/t/aide/restart.html diff --git a/webcit/static/t/box_serverrestart.html b/webcit/static/t/aide/serverrestart/box.html similarity index 100% rename from webcit/static/t/box_serverrestart.html rename to webcit/static/t/aide/serverrestart/box.html diff --git a/webcit/static/t/box_serverrestartpage.html b/webcit/static/t/aide/serverrestart/box_page.html similarity index 100% rename from webcit/static/t/box_serverrestartpage.html rename to webcit/static/t/aide/serverrestart/box_page.html diff --git a/webcit/static/t/box_serverrestartpagedo.html b/webcit/static/t/aide/serverrestart/box_page_do.html similarity index 100% rename from webcit/static/t/box_serverrestartpagedo.html rename to webcit/static/t/aide/serverrestart/box_page_do.html diff --git a/webcit/static/t/submit_siteconfig.html b/webcit/static/t/aide/siteconfig/submit.html similarity index 100% rename from webcit/static/t/submit_siteconfig.html rename to webcit/static/t/aide/siteconfig/submit.html diff --git a/webcit/static/t/tab_siteconfig_access.html b/webcit/static/t/aide/siteconfig/tab_access.html similarity index 100% rename from webcit/static/t/tab_siteconfig_access.html rename to webcit/static/t/aide/siteconfig/tab_access.html diff --git a/webcit/static/t/tab_siteconfig_autopurger.html b/webcit/static/t/aide/siteconfig/tab_autopurger.html similarity index 100% rename from webcit/static/t/tab_siteconfig_autopurger.html rename to webcit/static/t/aide/siteconfig/tab_autopurger.html diff --git a/webcit/static/t/tab_siteconfig_directory.html b/webcit/static/t/aide/siteconfig/tab_directory.html similarity index 100% rename from webcit/static/t/tab_siteconfig_directory.html rename to webcit/static/t/aide/siteconfig/tab_directory.html diff --git a/webcit/static/t/tab_siteconfig_general.html b/webcit/static/t/aide/siteconfig/tab_general.html similarity index 96% rename from webcit/static/t/tab_siteconfig_general.html rename to webcit/static/t/aide/siteconfig/tab_general.html index ab37d6f7a..b9c116f28 100644 --- a/webcit/static/t/tab_siteconfig_general.html +++ b/webcit/static/t/aide/siteconfig/tab_general.html @@ -28,7 +28,7 @@ diff --git a/webcit/static/t/tab_siteconfig_indexing.html b/webcit/static/t/aide/siteconfig/tab_indexing.html similarity index 100% rename from webcit/static/t/tab_siteconfig_indexing.html rename to webcit/static/t/aide/siteconfig/tab_indexing.html diff --git a/webcit/static/t/tab_siteconfig_network.html b/webcit/static/t/aide/siteconfig/tab_network.html similarity index 100% rename from webcit/static/t/tab_siteconfig_network.html rename to webcit/static/t/aide/siteconfig/tab_network.html diff --git a/webcit/static/t/tab_siteconfig_pop3.html b/webcit/static/t/aide/siteconfig/tab_pop3.html similarity index 100% rename from webcit/static/t/tab_siteconfig_pop3.html rename to webcit/static/t/aide/siteconfig/tab_pop3.html diff --git a/webcit/static/t/tab_siteconfig_pushmail.html b/webcit/static/t/aide/siteconfig/tab_pushmail.html similarity index 100% rename from webcit/static/t/tab_siteconfig_pushmail.html rename to webcit/static/t/aide/siteconfig/tab_pushmail.html diff --git a/webcit/static/t/tab_siteconfig_tuning.html b/webcit/static/t/aide/siteconfig/tab_tuning.html similarity index 100% rename from webcit/static/t/tab_siteconfig_tuning.html rename to webcit/static/t/aide/siteconfig/tab_tuning.html diff --git a/webcit/static/t/siteconfig_tzsection.html b/webcit/static/t/aide/siteconfig/tzsection.html similarity index 100% rename from webcit/static/t/siteconfig_tzsection.html rename to webcit/static/t/aide/siteconfig/tzsection.html diff --git a/webcit/static/t/aide_usermanagement.html b/webcit/static/t/aide/usermanagement.html similarity index 100% rename from webcit/static/t/aide_usermanagement.html rename to webcit/static/t/aide/usermanagement.html diff --git a/webcit/static/t/aide_global_config.html b/webcit/static/t/aide_global_config.html deleted file mode 100644 index aa8e79b70..000000000 --- a/webcit/static/t/aide_global_config.html +++ /dev/null @@ -1,6 +0,0 @@ -
    -
    • -
    • -
    • -
    • -
diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html index f0358e199..7f25156bf 100644 --- a/webcit/static/t/edit_message.html +++ b/webcit/static/t/edit_message.html @@ -26,7 +26,7 @@ - + @@ -114,7 +114,7 @@
    diff --git a/webcit/static/t/section_attach_select.html b/webcit/static/t/edit_message/section_attach_select.html similarity index 100% rename from webcit/static/t/section_attach_select.html rename to webcit/static/t/edit_message/section_attach_select.html diff --git a/webcit/static/t/files.html b/webcit/static/t/files.html index 7becd4de4..70ba56d59 100644 --- a/webcit/static/t/files.html +++ b/webcit/static/t/files.html @@ -20,7 +20,7 @@  &SortBy=">" />  &SortBy=">" /> - + diff --git a/webcit/static/t/files_jspicview.html b/webcit/static/t/files/picview.js similarity index 100% rename from webcit/static/t/files_jspicview.html rename to webcit/static/t/files/picview.js diff --git a/webcit/static/t/section_files_onefile.html b/webcit/static/t/files/section_onefile.html similarity index 100% rename from webcit/static/t/section_files_onefile.html rename to webcit/static/t/files/section_onefile.html diff --git a/webcit/static/t/section_files_onefile_picview.html b/webcit/static/t/files/section_onefile_picview.html similarity index 100% rename from webcit/static/t/section_files_onefile_picview.html rename to webcit/static/t/files/section_onefile_picview.html diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html index 8b5bb528f..b0f4b7f24 100644 --- a/webcit/static/t/iconbar.html +++ b/webcit/static/t/iconbar.html @@ -65,7 +65,7 @@
  • -"> +">
    • diff --git a/webcit/static/t/iconbar_edit.html b/webcit/static/t/iconbar/edit.html similarity index 100% rename from webcit/static/t/iconbar_edit.html rename to webcit/static/t/iconbar/edit.html diff --git a/webcit/static/t/iconbar_save.html b/webcit/static/t/iconbar/save.html similarity index 100% rename from webcit/static/t/iconbar_save.html rename to webcit/static/t/iconbar/save.html diff --git a/webcit/static/t/iconbar_user.css b/webcit/static/t/iconbar/user.css similarity index 100% rename from webcit/static/t/iconbar_user.css rename to webcit/static/t/iconbar/user.css diff --git a/webcit/static/t/json_floor.html b/webcit/static/t/json/floor.html similarity index 100% rename from webcit/static/t/json_floor.html rename to webcit/static/t/json/floor.html diff --git a/webcit/static/t/json_floors.html b/webcit/static/t/json/floors.html similarity index 100% rename from webcit/static/t/json_floors.html rename to webcit/static/t/json/floors.html diff --git a/webcit/static/t/json_lkra.html b/webcit/static/t/json/lkra.html similarity index 100% rename from webcit/static/t/json_lkra.html rename to webcit/static/t/json/lkra.html diff --git a/webcit/static/t/json_room.html b/webcit/static/t/json/room.html similarity index 100% rename from webcit/static/t/json_room.html rename to webcit/static/t/json/room.html diff --git a/webcit/static/t/json_roomflr.html b/webcit/static/t/json/roomflr.html similarity index 100% rename from webcit/static/t/json_roomflr.html rename to webcit/static/t/json/roomflr.html diff --git a/webcit/static/t/menu_advanced_roomcommands.html b/webcit/static/t/menu/advanced_roomcommands.html similarity index 100% rename from webcit/static/t/menu_advanced_roomcommands.html rename to webcit/static/t/menu/advanced_roomcommands.html diff --git a/webcit/static/t/menu_basic_commands.html b/webcit/static/t/menu/basic_commands.html similarity index 100% rename from webcit/static/t/menu_basic_commands.html rename to webcit/static/t/menu/basic_commands.html diff --git a/webcit/static/t/menu_your_info.html b/webcit/static/t/menu/your_info.html similarity index 87% rename from webcit/static/t/menu_your_info.html rename to webcit/static/t/menu/your_info.html index 04609c936..d3d28f581 100644 --- a/webcit/static/t/menu_your_info.html +++ b/webcit/static/t/menu/your_info.html @@ -5,6 +5,6 @@
    • -
    • +
    • diff --git a/webcit/static/t/paging.html b/webcit/static/t/paging.html index 5ae351292..a5fbc07d3 100644 --- a/webcit/static/t/paging.html +++ b/webcit/static/t/paging.html @@ -1 +1 @@ - + diff --git a/webcit/static/t/paging_anchor.html b/webcit/static/t/paging/anchor.html similarity index 100% rename from webcit/static/t/paging_anchor.html rename to webcit/static/t/paging/anchor.html diff --git a/webcit/static/t/paging_failed_hook.html b/webcit/static/t/paging/failed_hook.html similarity index 100% rename from webcit/static/t/paging_failed_hook.html rename to webcit/static/t/paging/failed_hook.html diff --git a/webcit/static/t/page_now.html b/webcit/static/t/paging/now.html similarity index 100% rename from webcit/static/t/page_now.html rename to webcit/static/t/paging/now.html diff --git a/webcit/static/t/preferences.html b/webcit/static/t/preferences.html index d18e65d4f..7b40a0b56 100644 --- a/webcit/static/t/preferences.html +++ b/webcit/static/t/preferences.html @@ -4,6 +4,6 @@

    - +
    diff --git a/webcit/static/t/box_preferences.html b/webcit/static/t/prefs/box.html similarity index 98% rename from webcit/static/t/box_preferences.html rename to webcit/static/t/prefs/box.html index 5ee06cfaa..0dabf5c64 100644 --- a/webcit/static/t/box_preferences.html +++ b/webcit/static/t/prefs/box.html @@ -205,7 +205,7 @@ @@ -215,7 +215,7 @@ @@ -225,7 +225,7 @@ diff --git a/webcit/static/t/pushemail.html b/webcit/static/t/prefs/pushemail.html similarity index 100% rename from webcit/static/t/pushemail.html rename to webcit/static/t/prefs/pushemail.html diff --git a/webcit/static/t/section_msg_handle_select.html b/webcit/static/t/prefs/section_msg_handle_select.html similarity index 100% rename from webcit/static/t/section_msg_handle_select.html rename to webcit/static/t/prefs/section_msg_handle_select.html diff --git a/webcit/static/t/section_msg_sender_from_select.html b/webcit/static/t/prefs/section_msg_sender_from_select.html similarity index 100% rename from webcit/static/t/section_msg_sender_from_select.html rename to webcit/static/t/prefs/section_msg_sender_from_select.html diff --git a/webcit/static/t/section_msg_sender_name_select.html b/webcit/static/t/prefs/section_msg_sender_name_select.html similarity index 100% rename from webcit/static/t/section_msg_sender_name_select.html rename to webcit/static/t/prefs/section_msg_sender_name_select.html diff --git a/webcit/static/t/section_aide_inetconf_entry.html b/webcit/static/t/section_aide_inetconf_entry.html deleted file mode 100644 index 6d80e5cd9..000000000 --- a/webcit/static/t/section_aide_inetconf_entry.html +++ /dev/null @@ -1,5 +0,0 @@ - - - -')" > - diff --git a/webcit/static/t/section_ignetconf.html b/webcit/static/t/section_ignetconf.html deleted file mode 100644 index bf9c9cad5..000000000 --- a/webcit/static/t/section_ignetconf.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - -&index="> - diff --git a/webcit/static/t/subject_aiderestart.html b/webcit/static/t/subject_aiderestart.html deleted file mode 100644 index 8b11af6e3..000000000 --- a/webcit/static/t/subject_aiderestart.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/webcit/static/t/subject_floorconfig.html b/webcit/static/t/subject_floorconfig.html deleted file mode 100644 index 6ab741a0e..000000000 --- a/webcit/static/t/subject_floorconfig.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/webcit/static/t/subject_inet_aliases.html b/webcit/static/t/subject_inet_aliases.html deleted file mode 100644 index a68b51929..000000000 --- a/webcit/static/t/subject_inet_aliases.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/webcit/static/t/subject_pushmail.html b/webcit/static/t/subject_pushmail.html deleted file mode 100644 index 394b5c408..000000000 --- a/webcit/static/t/subject_pushmail.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/webcit/static/t/subject_tuning.html b/webcit/static/t/subject_tuning.html deleted file mode 100644 index 5bb01aeac..000000000 --- a/webcit/static/t/subject_tuning.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/webcit/static/t/view_message_inline_attach.html b/webcit/static/t/view_message/inline_attach.html similarity index 100% rename from webcit/static/t/view_message_inline_attach.html rename to webcit/static/t/view_message/inline_attach.html diff --git a/webcit/static/t/view_message_list_attach.html b/webcit/static/t/view_message/list_attach.html similarity index 100% rename from webcit/static/t/view_message_list_attach.html rename to webcit/static/t/view_message/list_attach.html diff --git a/webcit/static/t/view_message_print.html b/webcit/static/t/view_message/print.html similarity index 100% rename from webcit/static/t/view_message_print.html rename to webcit/static/t/view_message/print.html diff --git a/webcit/static/t/view_message_replyquote.html b/webcit/static/t/view_message/replyquote.html similarity index 100% rename from webcit/static/t/view_message_replyquote.html rename to webcit/static/t/view_message/replyquote.html diff --git a/webcit/static/t/view_message_wikiedit.html b/webcit/static/t/view_message/wikiedit.html similarity index 100% rename from webcit/static/t/view_message_wikiedit.html rename to webcit/static/t/view_message/wikiedit.html diff --git a/webcit/static/t/who.html b/webcit/static/t/who.html index c4d9f8224..6aab4c59b 100644 --- a/webcit/static/t/who.html +++ b/webcit/static/t/who.html @@ -21,7 +21,7 @@ return confirm('');
    - +
    \n" ); -- 2.30.2