From: <du...@us...> - 2012-12-22 18:31:49
|
Revision: 10487 http://sourceforge.net/p/xoops/svn/10487 Author: dugris Date: 2012-12-22 18:31:46 +0000 (Sat, 22 Dec 2012) Log Message: ----------- Remove notifications templates and blocks Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php Removed Paths: ------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_list.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html 2012-12-22 18:14:26 UTC (rev 10486) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html 2012-12-22 18:31:46 UTC (rev 10487) @@ -1,28 +0,0 @@ -<form action="<{$block.target_page}>" method="post"> - <table class="outer"> - <{foreach item=category from=$block.categories}> - <{foreach name=inner item=event from=$category.events}> - <{if $smarty.foreach.inner.first}> - <tr> - <td class="head" colspan="2"><{$category.title}></td> - </tr> - <{/if}> - <tr> - <td class="odd"> - <{counter assign=index}> - <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" /> - <input type="checkbox" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> /> - </td> - <td class="odd"><{$event.caption}></td> - </tr> - <{/foreach}> - <{/foreach}> - <tr> - <td class="foot" colspan="2"> - <input type="hidden" name="not_redirect" value="<{$block.redirect_script}>"> - <input type="hidden" value="<{$block.notification_token}>" name="XOOPS_TOKEN_REQUEST" /> - <input type="submit" name="not_submit" value="<{$block.submit_button}>" /> - </td> - </tr> - </table> -</form> \ No newline at end of file Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_list.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_list.html 2012-12-22 18:14:26 UTC (rev 10486) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_list.html 2012-12-22 18:31:46 UTC (rev 10487) @@ -1,40 +0,0 @@ -<h4><{$lang_activenotifications}></h4> -<form name="notificationlist" action="notifications.php" method="post"> -<table class="outer"> - <tr> - <th><input name="allbox" id="allbox" onclick="xoopsCheckAll('notificationlist', 'allbox');" type="checkbox" value="<{$lang_checkall}>" /></th> - <th><{$lang_event}></th> - <th><{$lang_category}></th> - <th><{$lang_itemid}></th> - <th><{$lang_itemname}></th> - </tr> - <{foreach item=module from=$modules}> - <tr> - <td class="head"><input name="del_mod[<{$module.id}>]" id="del_mod[]" onclick="xoopsCheckGroup('notificationlist', 'del_mod[<{$module.id}>]', 'del_not[<{$module.id}>][]');" type="checkbox" value="<{$module.id}>" /></td> - <td class="head" colspan="4"><{$lang_module}>: <{$module.name}></td> - </tr> - <{foreach item=category from=$module.categories}> - <{foreach item=item from=$category.items}> - <{foreach item=notification from=$item.notifications}> - <tr> - <{cycle values=odd,even assign=class}> - <td class="<{$class}>"><input type="checkbox" name="del_not[<{$module.id}>][]" id="del_not[<{$module.id}>]" value="<{$notification.id}>" /></td> - <td class="<{$class}>"><{$notification.event_title}></td> - <td class="<{$class}>"><{$notification.category_title}></td> - <td class="<{$class}>"><{if $item.id != 0}><{$item.id}><{/if}></td> - <td class="<{$class}>"><{if $item.id != 0}><{if $item.url != ''}><a href="<{$item.url}>" title="<{$item.name}>"><{/if}><{$item.name}><{if $item.url != ''}></a><{/if}><{/if}></td> - </tr> - <{/foreach}> - <{/foreach}> - <{/foreach}> - <{/foreach}> - <tr> - <td class="foot" colspan="5"> - <input type="submit" name="delete_cancel" value="<{$lang_cancel}>" /> - <input type="reset" name="delete_reset" value="<{$lang_clear}>" /> - <input type="submit" name="delete" value="<{$lang_delete}>" /> - <input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{$notification_token}>" /> - </td> - </tr> -</table> -</form> Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html 2012-12-22 18:14:26 UTC (rev 10486) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html 2012-12-22 18:31:46 UTC (rev 10487) @@ -1,36 +0,0 @@ -<{if $xoops_notification.show}> - <form name="notification_select" action="<{$xoops_notification.target_page}>" method="post"> - <h4 class="txtcenter"><{$lang_activenotifications}></h4> - <input type="hidden" name="not_redirect" value="<{$xoops_notification.redirect_script}>" /> - <input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{php}>echo Xoops::getInstance()->security()->createToken();<{/php}>" /> - <table class="outer"> - <tr><th colspan="3"><{$lang_notificationoptions}></th></tr> - <tr> - <td class="head"><{$lang_category}></td> - <td class="head"><input name="allbox" id="allbox" onclick="xoopsCheckAll('notification_select','allbox');" type="checkbox" value="<{$lang_checkall}>" /></td> - <td class="head"><{$lang_events}></td> - </tr> - <{foreach name=outer item=category from=$xoops_notification.categories}> - <{foreach name=inner item=event from=$category.events}> - <tr> - <{if $smarty.foreach.inner.first}> - <td class="even" rowspan="<{$smarty.foreach.inner.total}>"><{$category.title}></td> - <{/if}> - <td class="odd"> - <{counter assign=index}> - <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" /> - <input type="checkbox" id="not_list[]" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> /> - </td> - <td class="odd"><{$event.caption}></td> - </tr> - <{/foreach}> - <{/foreach}> - <tr> - <td class="foot txtcenter" colspan="3"><input type="submit" name="not_submit" value="<{$lang_updatenow}>" /></td> - </tr> - </table> - <div class="txtcenter"> - <{$lang_notificationmethodis}>: <{$user_method}> [<a href="<{$editprofile_url}>" title="<{$lang_change}>"><{$lang_change}></a>] - </div> - </form> -<{/if}> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-12-22 18:14:26 UTC (rev 10486) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-12-22 18:31:46 UTC (rev 10487) @@ -71,116 +71,85 @@ $modversion['templates'][] = array('file' => 'system_comments_nest.html', 'description' => ''); $modversion['templates'][] = array('file' => 'system_siteclosed.html', 'description' => ''); $modversion['templates'][] = array('file' => 'system_dummy.html', 'description' => ''); -$modversion['templates'][] = array('file' => 'system_notification_list.html', 'description' => ''); -$modversion['templates'][] = array('file' => 'system_notification_select.html', 'description' => ''); $modversion['templates'][] = array('file' => 'system_block_dummy.html', 'description' => ''); $modversion['templates'][] = array('file' => 'system_homepage.html', 'description' => ''); $modversion['templates'][] = array('file' => 'system_form.html', 'description' => ''); $modversion['templates'][] = array('file' => 'system_confirm.html', 'description' => ''); // Admin Templates -/*$modversion['templates'][] = array('file' => 'system_header.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_modules.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_modules_install.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_modules_confirm.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_modules_result.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_avatars.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_smilies.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_blocks.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_blocks_item.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_comments.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_comments_list.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_userrank.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_users.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_preferences.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_mailusers.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_groups.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_images.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_templates.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_filemanager.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_index.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_maintenance.html', 'description' => '', 'type' => 'admin'); -$modversion['templates'][] = array('file' => 'system_help.html', 'description' => '', 'type' => 'admin'); -*/ // Blocks -$modversion['blocks'][] = array( - 'file' => 'system_blocks.php', 'name' => _MI_SYSTEM_BNAME2, 'description' => 'Shows user block', - 'show_func' => 'b_system_user_show', 'template' => 'system_block_user.html' -); +$i=0; +$modversion['blocks'][$i]['file'] = 'system_blocks.php'; +$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME2; +$modversion['blocks'][$i]['description'] = 'Shows user block'; +$modversion['blocks'][$i]['show_func'] = 'b_system_user_show'; +$modversion['blocks'][$i]['template'] = 'system_block_user.html'; +$i++; +$modversion['blocks'][$i]['file'] = 'system_blocks.php'; +$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME3; +$modversion['blocks'][$i]['description'] = 'Shows login form'; +$modversion['blocks'][$i]['show_func'] = 'b_system_login_show'; +$modversion['blocks'][$i]['template'] = 'system_block_login.html'; +$i++; +$modversion['blocks'][$i]['file'] = 'system_blocks.php'; +$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME5; +$modversion['blocks'][$i]['description'] = 'Shows contents waiting for approval'; +$modversion['blocks'][$i]['show_func'] = 'b_system_waiting_show'; +$modversion['blocks'][$i]['template'] = 'system_block_waiting.html'; +$i++; +$modversion['blocks'][$i]['file'] = 'system_blocks.php'; +$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME6; +$modversion['blocks'][$i]['description'] = 'Shows the main navigation menu of the site'; +$modversion['blocks'][$i]['show_func'] = 'b_system_main_show'; +$modversion['blocks'][$i]['edit_func'] = 'b_system_main_edit'; +$modversion['blocks'][$i]['template'] = 'system_block_mainmenu.html'; +$i++; +$modversion['blocks'][$i]['file'] = 'system_blocks.php'; +$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME7; +$modversion['blocks'][$i]['description'] = 'Shows basic info about the site and a link to Recommend Us pop up window'; +$modversion['blocks'][$i]['show_func'] = 'b_system_info_show'; +$modversion['blocks'][$i]['edit_func'] = 'b_system_info_edit'; +$modversion['blocks'][$i]['options'] = '320|190|s_poweredby.gif|1'; +$modversion['blocks'][$i]['template'] = 'system_block_siteinfo.html'; +$i++; +$modversion['blocks'][$i]['file'] = 'system_blocks.php'; +$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME8; +$modversion['blocks'][$i]['description'] = 'Displays users/guests currently online'; +$modversion['blocks'][$i]['show_func'] = 'b_system_online_show'; +$modversion['blocks'][$i]['template'] = 'system_block_online.html'; +$i++; +$modversion['blocks'][$i]['file'] = 'system_blocks.php'; +$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME9; +$modversion['blocks'][$i]['description'] = 'Top posters'; +$modversion['blocks'][$i]['show_func'] = 'b_system_topposters_show'; +$modversion['blocks'][$i]['options'] = '10|1'; +$modversion['blocks'][$i]['edit_func'] = 'b_system_topposters_edit'; +$modversion['blocks'][$i]['template'] = 'system_block_topusers.html'; +$i++; +$modversion['blocks'][$i]['file'] = 'system_blocks.php'; +$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME10; +$modversion['blocks'][$i]['description'] = 'Shows most recent users'; +$modversion['blocks'][$i]['show_func'] = 'b_system_newmembers_show'; +$modversion['blocks'][$i]['options'] = '10|1'; +$modversion['blocks'][$i]['edit_func'] = 'b_system_newmembers_edit'; +$modversion['blocks'][$i]['template'] = 'system_block_newusers.html'; +$i++; +$modversion['blocks'][$i]['file'] = 'system_blocks.php'; +$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME11; +$modversion['blocks'][$i]['description'] = 'Shows most recent comments'; +$modversion['blocks'][$i]['show_func'] = 'b_system_comments_show'; +$modversion['blocks'][$i]['options'] = '10'; +$modversion['blocks'][$i]['edit_func'] = 'b_system_comments_edit'; +$modversion['blocks'][$i]['template'] = 'system_block_comments.html'; +$i++; +$modversion['blocks'][$i]['file'] = 'system_blocks.php'; +$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME13; +$modversion['blocks'][$i]['description'] = 'Shows theme selection box'; +$modversion['blocks'][$i]['show_func'] = 'b_system_themes_show'; +$modversion['blocks'][$i]['options'] = '0|80'; +$modversion['blocks'][$i]['edit_func'] = 'b_system_themes_edit'; +$modversion['blocks'][$i]['template'] = 'system_block_themes.html'; -$modversion['blocks'][2]['file'] = 'system_blocks.php'; -$modversion['blocks'][2]['name'] = _MI_SYSTEM_BNAME3; -$modversion['blocks'][2]['description'] = 'Shows login form'; -$modversion['blocks'][2]['show_func'] = 'b_system_login_show'; -$modversion['blocks'][2]['template'] = 'system_block_login.html'; - -$modversion['blocks'][4]['file'] = 'system_blocks.php'; -$modversion['blocks'][4]['name'] = _MI_SYSTEM_BNAME5; -$modversion['blocks'][4]['description'] = 'Shows contents waiting for approval'; -$modversion['blocks'][4]['show_func'] = 'b_system_waiting_show'; -$modversion['blocks'][4]['template'] = 'system_block_waiting.html'; - -$modversion['blocks'][5]['file'] = 'system_blocks.php'; -$modversion['blocks'][5]['name'] = _MI_SYSTEM_BNAME6; -$modversion['blocks'][5]['description'] = 'Shows the main navigation menu of the site'; -$modversion['blocks'][5]['show_func'] = 'b_system_main_show'; -$modversion['blocks'][5]['edit_func'] = 'b_system_main_edit'; -$modversion['blocks'][5]['template'] = 'system_block_mainmenu.html'; - -$modversion['blocks'][6]['file'] = 'system_blocks.php'; -$modversion['blocks'][6]['name'] = _MI_SYSTEM_BNAME7; -$modversion['blocks'][6]['description'] = 'Shows basic info about the site and a link to Recommend Us pop up window'; -$modversion['blocks'][6]['show_func'] = 'b_system_info_show'; -$modversion['blocks'][6]['edit_func'] = 'b_system_info_edit'; -$modversion['blocks'][6]['options'] = '320|190|s_poweredby.gif|1'; -$modversion['blocks'][6]['template'] = 'system_block_siteinfo.html'; - -$modversion['blocks'][7]['file'] = 'system_blocks.php'; -$modversion['blocks'][7]['name'] = _MI_SYSTEM_BNAME8; -$modversion['blocks'][7]['description'] = 'Displays users/guests currently online'; -$modversion['blocks'][7]['show_func'] = 'b_system_online_show'; -$modversion['blocks'][7]['template'] = 'system_block_online.html'; - -$modversion['blocks'][8]['file'] = 'system_blocks.php'; -$modversion['blocks'][8]['name'] = _MI_SYSTEM_BNAME9; -$modversion['blocks'][8]['description'] = 'Top posters'; -$modversion['blocks'][8]['show_func'] = 'b_system_topposters_show'; -$modversion['blocks'][8]['options'] = '10|1'; -$modversion['blocks'][8]['edit_func'] = 'b_system_topposters_edit'; -$modversion['blocks'][8]['template'] = 'system_block_topusers.html'; - -$modversion['blocks'][9]['file'] = 'system_blocks.php'; -$modversion['blocks'][9]['name'] = _MI_SYSTEM_BNAME10; -$modversion['blocks'][9]['description'] = 'Shows most recent users'; -$modversion['blocks'][9]['show_func'] = 'b_system_newmembers_show'; -$modversion['blocks'][9]['options'] = '10|1'; -$modversion['blocks'][9]['edit_func'] = 'b_system_newmembers_edit'; -$modversion['blocks'][9]['template'] = 'system_block_newusers.html'; - -$modversion['blocks'][10]['file'] = 'system_blocks.php'; -$modversion['blocks'][10]['name'] = _MI_SYSTEM_BNAME11; -$modversion['blocks'][10]['description'] = 'Shows most recent comments'; -$modversion['blocks'][10]['show_func'] = 'b_system_comments_show'; -$modversion['blocks'][10]['options'] = '10'; -$modversion['blocks'][10]['edit_func'] = 'b_system_comments_edit'; -$modversion['blocks'][10]['template'] = 'system_block_comments.html'; - -// RMV-NOTIFY: -// Adding a block... -$modversion['blocks'][11]['file'] = 'system_blocks.php'; -$modversion['blocks'][11]['name'] = _MI_SYSTEM_BNAME12; -$modversion['blocks'][11]['description'] = 'Shows notification options'; -$modversion['blocks'][11]['show_func'] = 'b_system_notification_show'; -$modversion['blocks'][11]['template'] = 'system_block_notification.html'; - -$modversion['blocks'][12]['file'] = 'system_blocks.php'; -$modversion['blocks'][12]['name'] = _MI_SYSTEM_BNAME13; -$modversion['blocks'][12]['description'] = 'Shows theme selection box'; -$modversion['blocks'][12]['show_func'] = 'b_system_themes_show'; -$modversion['blocks'][12]['options'] = '0|80'; -$modversion['blocks'][12]['edit_func'] = 'b_system_themes_edit'; -$modversion['blocks'][12]['template'] = 'system_block_themes.html'; - // Menu $modversion['hasMain'] = 0; |