Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1291

Přidáno uživatelem Ondřej Fibich před téměř 13 roky(ů)

Upravy:

- reorganizace sablon, vsechny sablony, ktere se uzivaji ve vic controllerech by meli byt v korenove slozce view, ostatni ve slozkach pojmenovanych podle controlleru v nichz sou uzity
- automaticky preklad napoved a popisku k polim v knihone Forge
- uprava kodu pro zjisteni chyby v sessions
- uprava logovani fatal erroru

Opravy:

- ulozeni hlasovaci sablony vytvareni pracovniho vykazu
- vraceni unikatni mnoziny ID z IP_addresses_Model#get_ip_addresses_of_members_in_protective_period()
- oprava jmena metody Device_Model#select_list() prekryvajici metodu z ORM bez zachovani stejne deklarace

Zobrazit rozdíly:

freenetis/branches/testing/application/views/invoice_items/show.php
<h2><?php echo $headline ?></h2>
<?php echo html::anchor(url_lang::base() . 'invoice_items/edit/' . $invoice_item->id, __('Edit')) ?>
<br /><br />
<table class="extended" cellspacing="0">
<tr>
<th><?php echo __('ID') ?></th>
<td><?php echo $invoice_item->id ?></td>
</tr>
<tr>
<th><?php echo __('Invoice number') ?></th>
<td><?php echo html::anchor(url_lang::base() . 'invoices/show/' . $invoice_item->invoice_id, $invoice_item->invoice->invoice_nr) ?></td>
</tr>
<tr>
<th><?php echo __('Name') ?></th>
<td><?php echo $invoice_item->name ?></td>
</tr>
<tr>
<th><?php echo __('Code') ?></th>
<td><?php echo $invoice_item->code ?></td>
</tr>
<tr>
<th><?php echo __('Quantity') ?></th>
<td><?php echo $invoice_item->quantity ?></td>
</tr>
<tr>
<th><?php echo __('Author fee') ?></th>
<td><?php echo $invoice_item->author_fee ?></td>
</tr>
<tr>
<th><?php echo __('Contractual increase') ?></th>
<td><?php echo $invoice_item->contractual_increase ?></td>
</tr>
<tr>
<th><?php echo __('Service') ?></th>
<td><?php echo $invoice_item->service ?></td>
</tr>
<tr>
<th><?php echo __('Price') ?></th>
<td><?php echo $invoice_item->price ?></td>
</tr>
<tr>
<th><?php echo __('Price vat') ?></th>
<td><?php echo $invoice_item->price_vat ?></td>
</tr>
</table>
freenetis/branches/testing/application/views/selector/default.php
<p class="pagination">
<?php echo form::open($base_url, array('class' => 'selector', 'method' => 'get')) ?>
<?php echo form::dropdown('record_per_page', $sel_values_array, $current, 'onchange="this.form.submit()"'); ?>
<?php echo form::close() ?>
</p>
freenetis/branches/testing/application/views/device_admins/edit_device_admins.php
<h2><?php echo $headline ?></h2>
<br />
<?php print form::open(NULL, array('id' => 'form')); ?>
<table style="margin-left:auto;margin-right:auto;">
<tr>
<td style="vertical-align:top;">
<label><?php echo __('System users'); ?></label>
<table>
<tr>
<td><?php print $system_users_select; ?></td>
</tr>
</table>
</td>
<td>
<table style="width:100px;text-align:center;">
<tr>
<td><?php print $remove_button; ?></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td> <?php print $add_button; ?> </td>
</tr>
</table>
</td>
<td style="vertical-align:top;">
<label><?php echo __('Users in group'); ?></label>
<table>
<tr>
<td><?php print $group_users_select; ?></td>
</tr>
</table>
</td>
</tr>
<tr>
<td><?php print $system_users_search_box; ?></td>
<td></td>
<td><?php print $group_users_search_box; ?></td>
</tr>
</table>
<?php print form::close(); ?>
freenetis/branches/testing/application/views/device_admins/edit_device_admins_user.php
<h2><?php echo $headline ?></h2>
<br />
<?php print form::open(NULL, array('id' => 'form')); ?>
<table style="margin-left:auto;margin-right:auto;">
<tr>
<td style="vertical-align:top;">
<label><?php echo __('Users'); ?> <?php echo help::hint('device_admin_users_filter') ?></label>
<table>
<tr>
<td><?php print $left_users_select ?></td>
</tr>
<tr>
<td><?php echo __('Devices') ?></td>
</tr>
<tr>
<td><?php print $system_devices_select; ?></td>
</tr>
</table>
</td>
<td>
<table style="width:100px;text-align:center;">
<tr>
<td><?php print $remove_button; ?></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td> <?php print $add_button; ?> </td>
</tr>
</table>
</td>
<td style="vertical-align:top;">
<label><?php echo __('Users'); ?> <?php echo help::hint('device_admin_users_filter') ?></label>
<table>
<tr>
<td><?php print $right_users_select ?></td>
</tr>
<tr>
<td><?php echo __('Devices') ?></td>
</tr>
<tr>
<td><?php print $group_devices_select; ?></td>
</tr>
</table>
</td>
</tr>
<tr>
<td><?php print $system_devices_search_box; ?></td>
<td></td>
<td><?php print $group_devices_search_box; ?></td>
</tr>
</table>
<?php print form::close(); ?>

Také k dispozici: Unified diff