Revize 2235
Přidáno uživatelem David Raška před téměř 11 roky(ů)
| freenetis/branches/1.1/application/controllers/devices.php | ||
|---|---|---|
|
|
||
|
$group_address->input('district')
|
||
|
->class('join2')
|
||
|
->value(($device->address_point->town->quarter !== NULL ? $device->address_point->town->quarter : ""));
|
||
|
->value(($device->address_point->town->quarter !== NULL ? $device->address_point->town->quarter : $device->address_point->town->town));
|
||
|
|
||
|
$group_address->input('street')
|
||
|
->label('Street')
|
||
| freenetis/branches/1.1/application/controllers/members.php | ||
|---|---|---|
|
|
||
|
$form->input('district')
|
||
|
->class('join2')
|
||
|
->value(($member->address_point->town->quarter !== NULL ? $member->address_point->town->quarter : ""));
|
||
|
->value(($member->address_point->town->quarter !== NULL ? $member->address_point->town->quarter : $member->address_point->town->town));
|
||
|
|
||
|
$form->input('street')
|
||
|
->label('Street')
|
||
| ... | ... | |
|
->class('join2')
|
||
|
->value(($member->members_domicile->address_point->town->quarter !== NULL ?
|
||
|
$member->members_domicile->address_point->town->quarter :
|
||
|
"")
|
||
|
$member->members_domicile->address_point->town->town)
|
||
|
);
|
||
|
|
||
|
$form->input('domicile_street')
|
||
| freenetis/branches/1.1/application/models/town.php | ||
|---|---|---|
|
$zip_code_where = ' AND LOWER(zip_code) = ' . $this->db->escape(strtolower($zip_code));
|
||
|
}
|
||
|
|
||
|
// prevent saving address point in City-City format
|
||
|
if ($quarter == $town)
|
||
|
{
|
||
|
$quarter = NULL;
|
||
|
}
|
||
|
|
||
|
if (empty($quarter))
|
||
|
{
|
||
|
$quarter_where = ' AND (quarter IS NULL OR LENGTH(quarter) = 0)';
|
||
| freenetis/branches/1.1/application/views/devices/show.php | ||
|---|---|---|
|
</table>
|
||
|
|
||
|
<?php if (!empty($gps)): ?>
|
||
|
<a class="gmap" href="http://maps.google.com/maps?f=q&hl=<?php echo $lang ?>&geocode=&q=<?php echo $gpsx ?>,<?php echo $gpsy ?>&z=18&t=h&ie=UTF8" target="_blank">
|
||
|
<img alt="<?php echo __('Address point detail') ?>" src="http://maps.google.com/maps/api/staticmap?center=<?php echo $gpsx ?>,<?php echo $gpsy ?>&zoom=18&maptype=hybrid&size=300x300&markers=color:red%7C<?php echo $gpsx ?>,<?php echo $gpsy ?>&sensor=false" style="float: right; margin-right: 10px;" />
|
||
|
</a>
|
||
|
<div id="ap_gmap" style="float: <?php echo ($this->popup ? 'left' : 'right');?>">
|
||
|
<a class="gmap" href="http://maps.google.com/maps?f=q&hl=<?php echo $lang ?>&geocode=&q=<?php echo $gpsx ?>,<?php echo $gpsy ?>&z=18&t=h&ie=UTF8" target="_blank">
|
||
|
<img alt="<?php echo __('Address point detail') ?>" src="http://maps.google.com/maps/api/staticmap?center=<?php echo $gpsx ?>,<?php echo $gpsy ?>&zoom=18&maptype=hybrid&size=300x300&markers=color:red%7C<?php echo $gpsx ?>,<?php echo $gpsy ?>&sensor=false" style="float: right; margin-right: 10px;" />
|
||
|
</a>
|
||
|
</div>
|
||
|
<?php endif; ?>
|
||
|
|
||
|
<br class="clear" />
|
||
| freenetis/branches/1.1/application/views/members/show.php | ||
|---|---|---|
|
</td>
|
||
|
<?php if ($this->acl_check_view('Address_points_Controller', 'address_point')): ?>
|
||
|
<td style="border: none; padding: 0 0 0 10px;">
|
||
|
<a href="<?php echo url_lang::base() ?>address_points/show/<?php echo $member->members_domicile->address_point->id ?>" target="_blank" style="float: right; text-decoration: none;">
|
||
|
<a href="<?php echo url_lang::base() ?>address_points/show/<?php echo $member->members_domicile->address_point->id ?>" target="_blank" style="float: right; text-decoration: none;" class="popup_link">
|
||
|
<?php echo html::image(array
|
||
|
(
|
||
|
'width' => 16,
|
||
Také k dispozici: Unified diff
Opravy:
- Oprava zobrazeni zoom tlacitek mapy v detailu zarizeni
- Adresni bod trvaleho bydliste clena se nezobrazoval v popup dialogu
- refs #803 - Predvyplnovani casti mesta pri editaci
- refs #803 - Oprava ukladani adresniho bodu, kdyz se shodovalo jmeno mesta a mestske casti