@@ -4,6 +4,15 @@ UPGRADE Remember to always run these steps in order. They are ordered intentionally to either minimise or totally remove downtime during upgrade. +03/11/09 +----------------------------- + +1.) Run the following SQL command : + + ALTER TABLE + `navigation_links` ADD `target` varchar(10) NULL DEFAULT NULL AFTER `position`; + + 01/11/09 - v0.9.6.2 to v0.9.7 ----------------------------- UPGRADE @@ -1,5 +1,11 @@ <?php if (!defined('BASEPATH')) exit('No direct script access allowed'); - +/** + * @package PyroCMS + * @subpackage Navigation Module + * @author Phil Sturgeon - PyroCMS Development Team + * + * Admin controller for the navigation module. Handles actions such as editing links or creating new ones. + */ class Admin extends Admin_Controller { function __construct() @@ -40,6 +46,8 @@ class Admin extends Admin_Controller //... and get navigation links for each one $this->data->navigation[$group->abbrev] = $this->navigation_m->getLinks(array('group'=>$group->id, 'order'=>'position, title')); } + + // Create the layout $this->layout->create('admin/index', $this->data); } @@ -47,19 +55,20 @@ class Admin extends Admin_Controller function create() { $this->load->library('validation'); - $rules['title'] = 'trim|required|max_length[40]'; - $rules['url'] = 'trim'; - $rules['uri'] = 'trim'; - $rules['module_name'] = 'trim|alpha_dash'; - $rules['page_id'] = 'trim|numeric'; - $rules['navigation_group_id'] = 'trim|numeric|required'; - $rules['position'] = 'trim|numeric|required'; + $rules['title'] = 'trim|required|max_length[40]'; + $rules['url'] = 'trim'; + $rules['uri'] = 'trim'; + $rules['module_name'] = 'trim|alpha_dash'; + $rules['page_id'] = 'trim|numeric'; + $rules['navigation_group_id'] = 'trim|numeric|required'; + $rules['position'] = 'trim|numeric|required'; + $rules['target'] = 'trim|max_length[10]'; $this->validation->set_rules($rules); - $fields['module_name'] = 'Module'; - $fields['page_id'] = 'Page'; - $fields['navigation_group_id'] = 'Group'; + $fields['module_name'] = 'Module'; + $fields['page_id'] = 'Page'; + $fields['navigation_group_id'] = 'Group'; $this->validation->set_fields($fields); @@ -99,19 +108,20 @@ class Admin extends Admin_Controller $this->load->library('validation'); - $rules['title'] = 'trim|required|max_length[40]'; - $rules['url'] = 'trim'; - $rules['uri'] = 'trim'; - $rules['module_name'] = 'trim|alpha_dash'; - $rules['page_id'] = 'trim|numeric'; - $rules['navigation_group_id'] = 'trim|numeric|required'; - $rules['position'] = 'trim|numeric|required'; + $rules['title'] = 'trim|required|max_length[40]'; + $rules['url'] = 'trim'; + $rules['uri'] = 'trim'; + $rules['module_name'] = 'trim|alpha_dash'; + $rules['page_id'] = 'trim|numeric'; + $rules['navigation_group_id'] = 'trim|numeric|required'; + $rules['position'] = 'trim|numeric|required'; + $rules['target'] = 'trim|max_length[10]'; $this->validation->set_rules($rules); - $fields['module_name'] = 'Module'; - $fields['page_id'] = 'Page'; - $fields['navigation_group_id'] = 'Group'; + $fields['module_name'] = 'Module'; + $fields['page_id'] = 'Page'; + $fields['navigation_group_id'] = 'Group'; $this->validation->set_fields($fields); application/modules/navigation/controllers/admin.php @@ -1,45 +1,46 @@ <?php // labels -$lang['nav_note_label'] = 'Note'; -$lang['nav_title_label'] = 'Title'; -$lang['nav_position_label'] = 'Position'; -$lang['nav_url_label'] = 'URL'; -$lang['nav_actions_label'] = 'Actions'; -$lang['nav_details_label'] = 'Details'; -$lang['nav_text_label'] = 'Text'; -$lang['nav_group_label'] = 'Group'; -$lang['nav_location_label'] = 'Location'; -$lang['nav_uri_label'] = 'Site Link (URI)'; -$lang['nav_page_label'] = 'Page'; -$lang['nav_module_label'] = 'Module'; -$lang['nav_abbrev_label'] = 'Abbreviation'; -$lang['nav_edit_label'] = 'Edit'; -$lang['nav_delete_label'] = 'Delete'; -$lang['nav_group_delete_label'] = 'Delete group "%s"'; -$lang['nav_group_add_label'] = 'Add a group'; +$lang['nav_note_label'] = 'Note'; +$lang['nav_title_label'] = 'Title'; +$lang['nav_position_label'] = 'Position'; +$lang['nav_target_label'] = 'Target'; #translate +$lang['nav_url_label'] = 'URL'; +$lang['nav_actions_label'] = 'Actions'; +$lang['nav_details_label'] = 'Details'; +$lang['nav_text_label'] = 'Text'; +$lang['nav_group_label'] = 'Group'; +$lang['nav_location_label'] = 'Location'; +$lang['nav_uri_label'] = 'Site Link (URI)'; +$lang['nav_page_label'] = 'Page'; +$lang['nav_module_label'] = 'Module'; +$lang['nav_abbrev_label'] = 'Abbreviation'; +$lang['nav_edit_label'] = 'Edit'; +$lang['nav_delete_label'] = 'Delete'; +$lang['nav_group_delete_label'] = 'Delete group "%s"'; +$lang['nav_group_add_label'] = 'Add a group'; $lang['nav_link_module_select_default'] = '-- Select --'; $lang['nav_link_page_select_default'] = '-- Select --'; // titles -$lang['nav_link_create_title'] = 'Create navigation link'; -$lang['nav_link_edit_title'] = 'Edit navigation link "%s"'; +$lang['nav_link_create_title'] = 'Create navigation link'; +$lang['nav_link_edit_title'] = 'Edit navigation link "%s"'; // messages -$lang['nav_group_note'] = 'Currently navigation groups are referenced in the layout files and cannot be changed dynamically. You may add and delete them, but you will need to dive into the source-code to get the new group put into your site.'; -$lang['nav_group_no_links'] = 'There are no links in this group.'; -$lang['nav_no_groups'] = 'There are no navigation groups.'; -$lang['nav_group_delete_confirm'] = 'Are you sure you would like to delete this navigation group? This will delete ALL navigation links within the group, and the layout files will need to be edited to remove refference to it.'; -$lang['nav_group_create_title'] = 'New navigation group'; -$lang['nav_group_add_success'] = 'Your navigation group has been saved.'; -$lang['nav_group_add_error'] = 'An error occurred.'; +$lang['nav_group_note'] = 'Currently navigation groups are referenced in the layout files and cannot be changed dynamically. You may add and delete them, but you will need to dive into the source-code to get the new group put into your site.'; +$lang['nav_group_no_links'] = 'There are no links in this group.'; +$lang['nav_no_groups'] = 'There are no navigation groups.'; +$lang['nav_group_delete_confirm'] = 'Are you sure you would like to delete this navigation group? This will delete ALL navigation links within the group, and the layout files will need to be edited to remove refference to it.'; +$lang['nav_group_create_title'] = 'New navigation group'; +$lang['nav_group_add_success'] = 'Your navigation group has been saved.'; +$lang['nav_group_add_error'] = 'An error occurred.'; $lang['nav_group_mass_delete_success'] = 'The navigation group has been deleted.'; -$lang['nav_link_add_success'] = 'The navigation link was added.'; -$lang['nav_link_add_error'] = 'An unexpected error occurred.'; -$lang['nav_link_not_exist_error'] = 'This navigation link does not exist.'; -$lang['nav_link_edit_success'] = 'The navigation link was saved.'; -$lang['nav_link_delete_success'] = 'The navigation link has been deleted.'; +$lang['nav_link_add_success'] = 'The navigation link was added.'; +$lang['nav_link_add_error'] = 'An unexpected error occurred.'; +$lang['nav_link_not_exist_error'] = 'This navigation link does not exist.'; +$lang['nav_link_edit_success'] = 'The navigation link was saved.'; +$lang['nav_link_delete_success'] = 'The navigation link has been deleted.'; -$lang['nav_link_type_desc'] = 'Please pick <strong>one</strong> of the types of link from below.'; +$lang['nav_link_type_desc'] = 'Please pick <strong>one</strong> of the types of link from below.'; ?> application/modules/navigation/language/english/navigation_lang.php @@ -1,5 +1,11 @@ <?php if (!defined('BASEPATH')) exit('No direct script access allowed'); - +/** + * @package PyroCMS + * @subpackage Navigation Module + * @author Phil Sturgeon - PyroCMS Development Team + * + * Navigation model for the navigation module. + */ class Navigation_m extends Model { function getLink($id = 0) @@ -101,7 +107,7 @@ class Navigation_m extends Model { { foreach($group_links as &$link) { - $full_match = site_url($this->uri->uri_string()) == $link->url; + $full_match = site_url($this->uri->uri_string()) == $link->url; $segment1_match = site_url($this->uri->rsegment(1, '')) == $link->url; // Either the whole URI matches, or the first segment matches @@ -138,6 +144,7 @@ class Navigation_m extends Model { 'module_name' => $input['module_name'], 'page_id' => (int) $input['page_id'], 'position' => (int) $input['position'], + 'target' => $input['target'], 'navigation_group_id' => (int) $input['navigation_group_id'] )); @@ -156,6 +163,7 @@ class Navigation_m extends Model { 'module_name' => $input['module_name'], 'page_id' => (int) $input['page_id'], 'position' => (int) $input['position'], + 'target' => $input['target'], 'navigation_group_id' => (int) $input['navigation_group_id'] ), array('id' => $id)); application/modules/navigation/models/navigation_m.php @@ -1,58 +1,63 @@ -<? if($this->uri->segment(3,'create') == 'create'): ?> +<?php if($this->uri->segment(3,'create') == 'create'): ?> <h3><?=lang('nav_link_create_title');?></h3> -<? else: ?> +<?php else: ?> <h3><?=sprintf(lang('nav_link_edit_title'), $this->data->navigation_link->title);?></h3> -<? endif; ?> -<?= form_open($this->uri->uri_string()); ?> +<?php endif; ?> +<?php echo form_open($this->uri->uri_string()); ?> <fieldset> - <legend><?=lang('nav_details_label');?></legend> + <legend><?php echo lang('nav_details_label');?></legend> <div class="field"> - <label for="title"><?=lang('nav_text_label');?></label> + <label for="title"><?php echo lang('nav_text_label');?></label> <input type="text" id="title" name="title" maxlength="50" value="<?= $navigation_link->title; ?>" /> </div> <div class="field"> - <label for="navigation_group_id"><?=lang('nav_group_label');?></label> - <?=form_dropdown('navigation_group_id', $groups_select, $navigation_link->navigation_group_id, 'size="'.count($groups_select).'"') ?> + <label for="navigation_group_id"><?php echo lang('nav_group_label');?></label> + <?php echo form_dropdown('navigation_group_id', $groups_select, $navigation_link->navigation_group_id, 'size="'.count($groups_select).'"') ?> </div> <div class="field"> - <label for="position"><?=lang('nav_position_label');?></label> - <input type="text" id="position" name="position" value="<?= $navigation_link->position; ?>" /> + <label for="position"><?php echo lang('nav_position_label');?></label> + <input type="text" id="position" name="position" value="<?php echo $navigation_link->position; ?>" /> + </div> + + <div class="field"> + <label for="target"><?php echo lang('nav_target_label'); ?></label> + <input type="text" id="target" name="target" value="<?php echo $navigation_link->target; ?>" /> </div> </fieldset> <fieldset> - <legend><?=lang('nav_location_label');?></legend> - <p><?=lang('nav_link_type_desc');?></p> + <legend><?php echo lang('nav_location_label');?></legend> + <p><?php echo lang('nav_link_type_desc');?></p> <div class="field float-left"> - <label for="url"><?=lang('nav_url_label');?></label> - <input type="text" id="url" name="url" value="<?= empty($navigation_link->url) ? 'http://' : $navigation_link->url; ?>" /> + <label for="url"><?php echo lang('nav_url_label');?></label> + <input type="text" id="url" name="url" value="<?php echo empty($navigation_link->url) ? 'http://' : $navigation_link->url; ?>" /> </div> <div class="field float-left"> - <label for="module_name"><?=lang('nav_module_label');?></label> - <?=form_dropdown('module_name', array(lang('nav_link_module_select_default'))+$modules_select, $navigation_link->module_name) ?> + <label for="module_name"><?php echo lang('nav_module_label');?></label> + <?php echo form_dropdown('module_name', array(lang('nav_link_module_select_default'))+$modules_select, $navigation_link->module_name) ?> </div> <div class="field float-left"> - <label for="uri"><?=lang('nav_uri_label');?></label> + <label for="uri"><?php echo lang('nav_uri_label');?></label> <input type="text" id="uri" name="uri" value="<?= $navigation_link->uri; ?>" /> </div> <div class="field float-left"> - <label for="page_id"><?=lang('nav_page_label');?></label> + <label for="page_id"><?php echo lang('nav_page_label');?></label> <select name="page_id"> - <option value=""><?=lang('nav_link_page_select_default');?></option> - <? create_tree_select($pages_select, 0, 0, $navigation_link->page_id); ?> + <option value=""><?php echo lang('nav_link_page_select_default');?></option> + <?php create_tree_select($pages_select, 0, 0, $navigation_link->page_id); ?> </select> </div> </fieldset> - <? $this->load->view('admin/fragments/table_buttons', array('buttons' => array('save', 'cancel') )); ?> -<?= form_close(); ?> \ No newline at end of file + <?php $this->load->view('admin/fragments/table_buttons', array('buttons' => array('save', 'cancel') )); ?> +<?php echo form_close(); ?> \ No newline at end of file application/modules/navigation/views/admin/links/form.php @@ -2,7 +2,7 @@ <h2><?= lang('navigation_headline');?></h2> <ul class="spacer-left-dbl"> <? if(!empty($navigation['sidebar'])) foreach($navigation['sidebar'] as $nav_link): ?> - <li><?=anchor($nav_link->url, $nav_link->title); ?></li> + <li><?=anchor($nav_link->url, $nav_link->title,array('target' => $nav_link->target)); ?></li> <? endforeach; ?> </ul> \ No newline at end of file application/themes/advertising/views/menu.php @@ -2,7 +2,7 @@ <h1><?= lang('navigation_headline');?></h1> <ul> <? foreach($navigation['sidebar'] as $nav_link): ?> - <li><?=anchor($nav_link->url, $nav_link->title); ?></li> + <li><?=anchor($nav_link->url, $nav_link->title,array('target' => $nav_link->target)); ?></li> <? endforeach; ?> </ul> <? endif; ?> \ No newline at end of file application/themes/lazydays/views/leftnav.php c63fde2c91ac75f963970c11ea81d1a52c9887fb YorickPeterse info@yorickpeterse.com http://github.com/philsturgeon/pyrocms/commit/30e2164b6542e8fa9c135f5eb0fd1bfd798deb5b 30e2164b6542e8fa9c135f5eb0fd1bfd798deb5b 2009-11-03T04:17:31-08:00 2009-11-03T04:17:31-08:00 Fixed issue #32: Target support in link navigation. 1abb14280e17709444188f3936a7e250007a7ccf YorickPeterse info@yorickpeterse.com