Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1519

Přidáno uživatelem Ondřej Fibich před asi 12 roky(ů)

Upravy:

- pridavani ifacu v pridavani linky u formulare pro pridavani ifacu
- automaticke tvoreni jmena linky a zarizen i ve formulari pro pridavani zarizeni

Zobrazit rozdíly:

freenetis/branches/network/application/i18n/cs_CZ/texts.php
'add details to ip address' => 'Přidat detaily k IP adrese',
'add details to interface' => 'Přidat detaily k rozhraní',
'add details to link' => 'Přidat detaily k lince',
'add iface' => 'Přidat rozhraní',
'add items' => 'Přidat položky',
'add link' => 'Přidat linku',
'add member fee payment by cash' => 'Přidat platbu členského příspěvku hotově',
freenetis/branches/network/application/models/iface.php
* Returns name or MAC address of device
*
* @author David Raska
* @return array
* @return string
*/
public function __toString()
{
if (!$this || !$this->id)
{
return NULL;
return '';
}
$name = $this->name;
......
if (empty($name) && empty($name))
{
return $this->id;
return strval($this->id);
}
if (empty($name))
......
return $name;
}
return "";
return '';
}
/**
freenetis/branches/network/application/controllers/ifaces.php
->options($devices);
$c_form->dropdown('connected_to_interface')
->style('width: 620px')
->options($ifaces);
->style('width: 600px')
->options($ifaces)
->add_button('ifaces');
$c_form->dropdown('link_id')
->label('Link')
......
$c_form->dropdown('connected_to_interface')
->style('width: 600px')
->options($ifaces)
->selected($connecte_to_iface_id);
->selected($connecte_to_iface_id)
->add_button('ifaces');
$c_form->dropdown('link_id')
->label('Link')
freenetis/branches/network/application/controllers/links.php
$roaming = ORM::factory('link')->get_roaming();
$medias = array();
$selected_medium = 1;
if (is_numeric($iface_type))
{
$all_mediums = Iface_Model::get_types_has_link_with_medium($iface_type);
if ($iface_type == Iface_Model::TYPE_PORT ||
$iface_type == Iface_Model::TYPE_ETHERNET)
{
$selected_medium = Link_Model::MEDIUM_CABLE;
}
else if ($iface_type == Iface_Model::TYPE_WIRELESS)
{
$selected_medium = Link_Model::MEDIUM_AIR;
}
}
else
{
......
$form->dropdown('medium')
->options($medias)
->rules('required')
->selected($selected_medium)
->callback(array($this, 'valid_medium'));
$form->input('bitrate')
freenetis/branches/network/application/controllers/js.php
$this->views['ifaces_add']->device_id = $device_id;
$this->views['ifaces_add']->itype = $itype;
$this->views['ifaces_add']->add_button = $add_button;
$this->views['ifaces_add']->connect_type = $connect_type;
}
private function _js_ifaces_edit($iface_id = null, $type = null)
private function _js_ifaces_edit($iface_id = null, $type = null,
$add_button = FALSE, $connect_type = NULL)
{
$iface = new Iface_Model($iface_id);
......
$this->views['ifaces_edit'] = View::factory('js/ifaces_add');
$this->views['ifaces_edit']->device_id = $iface->device_id;
$this->views['ifaces_edit']->itype = $type;
$this->views['ifaces_edit']->add_button = $add_button;
$this->views['ifaces_edit']->connect_type = $connect_type;
$this->views['ifaces_edit']->is_edit = true;
}
}
freenetis/branches/network/application/views/js/device_templates_add.php
$('<td>').html($('<label>').text('<?php echo __('Name') ?>:')).append(
$('<input>').attr({
'name' : 'values[<?php echo Iface_Model::TYPE_ETHERNET ?>][items][' + i + '][name]',
'value' : '<?php echo Iface_Model::get_default_name(Iface_Model::TYPE_ETHERNET) ?>' + i,
'value' : '<?php echo Iface_Model::get_default_name(Iface_Model::TYPE_ETHERNET) ?>' + (i + 1),
'class' : 'textbox',
'type' : 'text'
}).css('margin', '4px 15px')
freenetis/branches/network/application/views/js/devices_add.php
if (made)
{
var type = $p.find('input[name^="type["]').val();
var default_name = (type == <?php echo Iface_Model::TYPE_WIRELESS ?>) ? '<?php echo __('air') ?>' : '<?php echo __('cable') ?>';
default_name += ' ' + (/^([0-9.]+: )?(.+) \([^(]+\)$/.exec($(this).parent().find('select[name^="connected["] option:selected').text())[2]);
default_name += ' - ' + $('#device_name').val();
$p.find('input[name^="link_id["]').val(null);
$p.find('input[name^="link_name["]').val(null);
$p.find('input[name^="link_name["]').val(default_name);
$p.find('input[name^="link_comment["]').val(null);
$p.find('input[name^="medium["]').val((type == <?php echo Iface_Model::TYPE_WIRELESS ?>) ? <?php echo Link_Model::MEDIUM_AIR ?> : <?php echo Link_Model::MEDIUM_CABLE ?>);
$p.find('input[name^="bitrate["]').val((type == <?php echo Iface_Model::TYPE_WIRELESS ?>) ? '<?php echo Link_Model::get_wireless_max_bitrate(Link_Model::NORM_802_11_G) ?>M' : '100M');
......
$('#device_type').change(function ()
{
var value = $(this).val();
var text = $(this).find('option:selected').text();
// reload devices templates
$('#device_template_id').html('<option><?php echo __('Loading data, please wait') ?>...</option>');
......
});
$('#device_template_id').html(options.join(''));
var name_parts = $('#device_name').val().split(' ');
if (name_parts.length <= 2)
{
$('#device_name').val(name_parts[0] + ' ' + text);
}
});
// change add button href for prefilled enum type in add form dialog
......
if (button.length)
{
var parts = button.attr('href').split('?');
button.attr('href', rtrim(parts[0], '0123456789/') + '/' + value + '?' + parts[1]);
parts[1] = (parts[1] == undefined) ? '' : '?' + parts[1];
button.attr('href', rtrim(parts[0], '0123456789/') + '/' + value + parts[1]);
}
});
freenetis/branches/network/application/views/js/ifaces_add.php
});
// on change of connected to
$('#connected_to').change(function ()
$('#connected_to').change(function (e, iface_id)
{
var $connected_to_iface = $('#connected_to_interface');
var $link_add_iface = $('.popup-add[href*="/ifaces/add"]');
var val = $(this).val();
$('#link_id').removeClass('required').removeClass('error');
......
$(this).addClass('required');
$connected_to_iface.addClass('required');
}
else
{
$link_add_iface.hide();
}
if (parseInt(val))
{
var iadd_href = $link_add_iface.attr('href').split('?');
var new_href = '<?php echo url_lang::base() ?>ifaces/add/' + val + '/null/1/<?php echo intval($itype) ? $itype : $connect_type ?>';
iadd_href[1] = (iadd_href[1] == undefined) ? '' : '?' + iadd_href[1];
$link_add_iface.attr('href', new_href + iadd_href[1]).show();
$connected_to_iface.html('<option value=""><?php echo __('Loading data, please wait') ?>...</option>');
$.getJSON('<?php echo url_lang::base() ?>json/get_ifaces', {
......
options.push(data[i].id);
options.push('"');
if (data.length == 1)
if (((data.length == 1) && (iface_id == undefined)) ||
((iface_id != undefined) && (iface_id == data[i].id)))
{
options.push(' selected="selected"');
}
......
}
});
// correct dropdown after adding of a iface
$('#connected_to_interface').live('addOption', function (e, new_option_id)
{
// reload ifaces
$('#connected_to').trigger('change', new_option_id);
});
// hide add button for ifaces at start
if (!$('.popup-add[href*="/ifaces/add"]').hasClass('isReloadOff'))
{
$('.popup-add[href*="/ifaces/add"]').addClass('isReloadOff');
if (!parseInt($('#connected_to').val()) && !parseInt($('#link_id').val()))
{
$('.popup-add[href*="/ifaces/add"]').hide();
}
else
{
$('#connected_to').trigger('change', $('#connected_to_interface').val());
}
}
<?php if (isset($is_edit) && $is_edit): ?>
// on change of interface type - reload form to proper edit form
$('#itype').change(function()
freenetis/branches/network/application/views/js/base.php
max = undefined;
}
e.addClass('iaidb_loaded'); // do not load again in base
e.after($('<a>').attr(a_attrs).html(decrease).click(function ()
{
var v = parseInt(e.val());
......
// jQuery tabs
$('#tabs, .tabs').tabs();
// activate increase/decrease buttons
$('input.increase_decrease_buttons, .increase_decrease_buttons input[type="text"]').each(function (i, e)
{
if (!$(e).hasClass('iaidb_loaded'))
{
input_add_increase_decrease_buttons($(e));
}
});
<?php if (!$nobase): ?>
// hide loader animation
......
// auto resize for non WYSIWYG textareas
$('textarea').not('.wysiwyg').autoResize();
// activate increase/decrease buttons
$('input.increase_decrease_buttons, .increase_decrease_buttons input[type="text"]').each(function (i, e)
{
input_add_increase_decrease_buttons($(e));
});
/* FIX-ME: Commented by Ondřej Fibich at 22.1.2012
* This code causes funanbol import crash
* >>>>

Také k dispozici: Unified diff