Menu
▾
▴
[mxbb-commits] core/admin admin_mx_block_cp.php, 1.21, 1.22 admin_mx_page_cp.php, 1.30, 1.31
|
From: Jon O. <jon...@us...> - 2008-03-09 23:38:07
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17021/admin Modified Files: admin_mx_block_cp.php admin_mx_page_cp.php Log Message: Virtual pages See notes is Dev area Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** admin_mx_page_cp.php 11 Feb 2008 11:13:16 -0000 1.30 --- admin_mx_page_cp.php 9 Mar 2008 23:37:59 -0000 1.31 *************** *** 975,979 **** } ! $sql = "SELECT cbl.*, blk.*, function_admin FROM " . COLUMN_BLOCK_TABLE . " cbl, " . BLOCK_TABLE . " blk, --- 975,979 ---- } ! $sql = "SELECT cbl.*, blk.*, fnc.function_file, function_admin FROM " . COLUMN_BLOCK_TABLE . " cbl, " . BLOCK_TABLE . " blk, *************** *** 1034,1037 **** --- 1034,1039 ---- } + $controller_block = $block_rows[$block]['function_file'] == 'mx_multiple_blocks.php' || $block_rows[$block]['function_file'] == 'mx_dynamic.php' || $block_rows[$block]['function_file'] == 'mx_virtual.php'; + $template->assign_block_vars('pages.columnrow.blockrow', array( 'L_SETTING' => $l_setting, *************** *** 1043,1046 **** --- 1045,1049 ---- 'BLOCK_LAST_EDITED' => ( $editor_name != '' ) ? ' (' . $lang['Block_updated_by'] . $editor_name . ', ' . $edit_time . ')' : '', + 'IMG_ICON_BLOCK' => $controller_block ? $admin_icon['page'] : $admin_icon['block'], 'ROW_COLOR' => $row_color, *************** *** 1072,1075 **** --- 1075,1084 ---- 'LIST_BLOCK' => $blocklist, 'S_SUBMIT' => $lang['Add_Block'], + 'S_SUBMIT_SPLIT' => $lang['Add_Split_Block'], + 'S_SUBMIT_SPLIT_EXPLAIN' => $lang['Add_Split_Block_explain'], + 'S_SUBMIT_DYNAMIC' => $lang['Add_Dynamic_Block'], + 'S_SUBMIT_DYNAMIC_EXPLAIN' => $lang['Add_Dynamic_Block_explain'], + 'S_SUBMIT_VIRTUAL' => $lang['Add_Virtual_Block'], + 'S_SUBMIT_VIRTUAL_EXPLAIN' => $lang['Add_Virtual_Block_explain'], 'S_HIDDEN_FIELDS' => $s_hidden_page_fields Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** admin_mx_block_cp.php 22 Feb 2008 23:02:49 -0000 1.21 --- admin_mx_block_cp.php 9 Mar 2008 23:37:59 -0000 1.22 *************** *** 144,148 **** $block_id = ''; $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . mx_append_sid(PORTAL_URL . "admin/admin_mx_block_cp.".$phpEx, "block_id=$block_id&module_id=$module_id&function_id=$function_id&portalpage=$portalpage$has_dyn_block_id&sid=".$userdata['session_id'],true) . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . mx_append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage$has_dyn_block_id") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } } --- 144,148 ---- $block_id = ''; $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . mx_append_sid(PORTAL_URL . "admin/admin_mx_block_cp.".$phpEx, "block_id=$block_id&module_id=$module_id&function_id=$function_id&portalpage=$portalpage$has_dyn_block_id&sid=".$userdata['session_id'],true) . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . mx_append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage$has_dyn_block_id") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message ); } } |