Revize 2326
Přidáno uživatelem David Raška před více než 10 roky(ů)
| freenetis/branches/1.2/application/controllers/devices.php | ||
|---|---|---|
|
->type('combo')
|
||
|
->callback('json/town_name');
|
||
|
|
||
|
$filter_form->add('quarter')
|
||
|
->callback('json/quarter_name');
|
||
|
|
||
|
$filter_form->add('street')
|
||
|
->type('combo')
|
||
|
->callback('json/street_name');
|
||
| ... | ... | |
|
->type('select')
|
||
|
->values(array_unique(ORM::factory('town')->select_list('id', 'town')));
|
||
|
|
||
|
$filter_form->add('quarter')
|
||
|
->table('t')
|
||
|
->callback('json/quarter_name');
|
||
|
|
||
|
$filter_form->add('street')
|
||
|
->type('select')
|
||
|
->values(array_unique(ORM::factory('street')->select_list('id', 'street')));
|
||
| freenetis/branches/1.2/application/controllers/js.php | ||
|---|---|---|
|
$member_id = NULL;
|
||
|
|
||
|
$account = new Account_Model($account_id);
|
||
|
$vs_model = new Variable_Symbol_Model();
|
||
|
$vss = $vs_model->find_account_variable_symbols($account_id);
|
||
|
|
||
|
if ($account->id)
|
||
|
{
|
||
| ... | ... | |
|
$this->views['transfers_payment_calculator']->account_id = $account_id;
|
||
|
$this->views['transfers_payment_calculator']->member_id = $member_id;
|
||
|
$this->views['transfers_payment_calculator']->can_add = $can_add;
|
||
|
|
||
|
if ($vss->count() > 0 && Settings::get('export_header_bank_account') != NULL)
|
||
|
{
|
||
|
$bank_account = new Bank_account_Model(Settings::get('export_header_bank_account'));
|
||
|
|
||
|
$this->views['transfers_payment_calculator']->account_nr = $bank_account->account_nr;
|
||
|
$this->views['transfers_payment_calculator']->bank_nr = $bank_account->bank_nr;
|
||
|
$this->views['transfers_payment_calculator']->variable_symbol = $vss->current()->variable_symbol;
|
||
|
$this->views['transfers_payment_calculator']->show_qr = true;
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
$this->views['transfers_payment_calculator']->show_qr = false;
|
||
|
}
|
||
|
}
|
||
|
|
||
|
private function _js_users_show($user_id = NULL)
|
||
| freenetis/branches/1.2/application/controllers/json.php | ||
|---|---|---|
|
{
|
||
|
$um = new User_Model($user_id);
|
||
|
|
||
|
$result = array(
|
||
|
'country_id' => $um->member->address_point->country_id,
|
||
|
'town_id' => $um->member->address_point->town_id,
|
||
|
'street_id' => $um->member->address_point->street_id,
|
||
|
'street_number' => $um->member->address_point->street_number,
|
||
|
);
|
||
|
$result = array();
|
||
|
|
||
|
if (Address_points_Controller::is_address_point_server_active())
|
||
|
{
|
||
|
$result = array(
|
||
|
'country_id' => $um->member->address_point->country_id,
|
||
|
'town' => $um->member->address_point->town->town,
|
||
|
'quarter' => $um->member->address_point->town->quarter,
|
||
|
'street' => $um->member->address_point->street->street,
|
||
|
'street_number' => $um->member->address_point->street_number,
|
||
|
'zip' => $um->member->address_point->town->zip_code,
|
||
|
);
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
$result = array(
|
||
|
'country_id' => $um->member->address_point->country_id,
|
||
|
'town_id' => $um->member->address_point->town_id,
|
||
|
'street_id' => $um->member->address_point->street_id,
|
||
|
'street_number' => $um->member->address_point->street_number,
|
||
|
);
|
||
|
}
|
||
|
|
||
|
echo json_encode($result);
|
||
|
}
|
||
| freenetis/branches/1.2/application/controllers/members.php | ||
|---|---|---|
|
$grid->order_field('street_number');
|
||
|
|
||
|
$grid->order_field('town');
|
||
|
|
||
|
$grid->order_field('quarter');
|
||
|
|
||
|
if (Settings::get('finance_enabled'))
|
||
|
{
|
||
| ... | ... | |
|
)
|
||
|
);
|
||
|
|
||
|
$filter_form->add('quarter')
|
||
|
->table('t')
|
||
|
->callback('json/quarter_name');
|
||
|
|
||
|
$filter_form->add('street')
|
||
|
->type('select')
|
||
|
->table('s')
|
||
| freenetis/branches/1.2/application/i18n/en_US/texts.php | ||
|---|---|---|
|
'%s hours ago' => '%s hours ago',
|
||
|
'association members' => 'Association members',
|
||
|
'freenetis_version' => 'FreenetIS version',
|
||
|
'from2' => 'from',
|
||
|
'new member' => 'New member',
|
||
|
'username' => 'Username',
|
||
|
'password' => 'Password',
|
||
| freenetis/branches/1.2/application/models/address_point.php | ||
|---|---|---|
|
// street number
|
||
|
if ($street_number == 0 || empty($street_number))
|
||
|
{
|
||
|
$where .= " AND street_number IS NULL ";
|
||
|
$where .= " AND street_number IS NULL OR street_number LIKE ''";
|
||
|
}
|
||
|
else
|
||
|
{
|
||
| freenetis/branches/1.2/application/models/device.php | ||
|---|---|---|
|
d.name, d.name AS device_name, u.id AS user_id,
|
||
|
u.name AS user_name, u.surname AS user_surname, u.login AS user_login,
|
||
|
d.login, d.password, d.price, d.trade_name, d.payment_rate,
|
||
|
d.buy_date, m.name AS member_name, s.street, t.town,
|
||
|
d.buy_date, m.name AS member_name, s.street, t.town, t.quarter,
|
||
|
ap.street_number, d.comment $select_cloud_iface
|
||
|
FROM devices d
|
||
|
JOIN users u ON d.user_id = u.id
|
||
| ... | ... | |
|
d.name AS device_name, u.id AS user_id, u.name AS user_name,
|
||
|
u.surname AS user_surname, u.login AS user_login,
|
||
|
d.login, d.password, d.price, d.trade_name, d.payment_rate,
|
||
|
d.buy_date, m.name AS member_name, s.street, t.town,
|
||
|
d.buy_date, m.name AS member_name, s.street, t.town, t.quarter,
|
||
|
ap.street_number, d.comment $select_cloud_iface
|
||
|
FROM devices d
|
||
|
JOIN users u ON d.user_id = u.id
|
||
| freenetis/branches/1.2/application/views/js/__pieces/address_point_database.php | ||
|---|---|---|
|
}
|
||
|
});
|
||
|
|
||
|
|
||
|
$('#user_id').live('change', function()
|
||
|
{
|
||
|
$.ajax({
|
||
|
url: '<?php echo url_lang::base() ?>json/get_user_address',
|
||
|
async: false,
|
||
|
data: {user_id: $(this).val()},
|
||
|
dataType: 'json',
|
||
|
success: function(data)
|
||
|
{
|
||
|
$('#country_id').val(data['country_id']);
|
||
|
$('#town').val(data['town']);
|
||
|
$('#district').val(data['quarter']);
|
||
|
|
||
|
if (data['street'] === '')
|
||
|
{
|
||
|
$('#street').val(data['number']);
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
$('#street').val(data['street']+' '+data['street_number']);
|
||
|
}
|
||
|
$('#zip').val(data['zip']).change();
|
||
|
}
|
||
|
});
|
||
|
});
|
||
|
|
||
|
$(document).ready(function(){
|
||
|
$('#street').change();
|
||
|
$('#domicile_street').change();
|
||
| freenetis/branches/1.2/application/views/js/base.php | ||
|---|---|---|
|
// Set show and hide menu events on mobile device
|
||
|
if (jQuery.browser.mobile)
|
||
|
{
|
||
|
$('body').addClass('cellphone');
|
||
|
|
||
|
$('#cellphone_hide_menu').click(function()
|
||
|
{
|
||
|
cellphone_hide_menu();
|
||
| ... | ... | |
|
});
|
||
|
|
||
|
// menu tooltip
|
||
|
if ($.cookie('cellphone_menu_tooltip') != '1')
|
||
|
if ($.cookie('cellphone_menu_tooltip') !== '1')
|
||
|
{
|
||
|
$('#cellphone_menu_tooltip').fadeIn(function(){
|
||
|
$.cookie('cellphone_menu_tooltip', '1', { path: '<?php echo Settings::get('suffix') ?>' });
|
||
| freenetis/branches/1.2/application/views/js/devices_add.php | ||
|---|---|---|
|
$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');
|
||
|
$p.find('input[name^="duplex["]').val(0);
|
||
|
$p.find('input[name^="duplex["]').val((type != <?php echo Iface_Model::TYPE_WIRELESS ?> && type != <?php echo Iface_Model::TYPE_VIRTUAL_AP ?>) ? 1 : 0);
|
||
|
$p.find('input[name^="wireless_ssid["]').val(null);
|
||
|
$p.find('input[name^="wireless_norm["]').val((type == <?php echo Iface_Model::TYPE_WIRELESS ?>) ? '<?php echo Link_Model::NORM_802_11_G ?>' : null);
|
||
|
$p.find('input[name^="wireless_frequency["]').val(null);
|
||
| freenetis/branches/1.2/application/views/js/ifaces_add.php | ||
|---|---|---|
|
$('#link_comment').val(null);
|
||
|
$('#medium').val((type == <?php echo Iface_Model::TYPE_WIRELESS ?>) ? <?php echo Link_Model::MEDIUM_AIR ?> : <?php echo Link_Model::MEDIUM_CABLE ?>);
|
||
|
$('#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');
|
||
|
$('#duplex').val(0);
|
||
|
$('#duplex').val((type != <?php echo Iface_Model::TYPE_WIRELESS ?> && type != <?php echo Iface_Model::TYPE_VIRTUAL_AP ?>) ? 1 : 0);
|
||
|
$('#wireless_ssid').val(null);
|
||
|
$('#wireless_norm').val((type == <?php echo Iface_Model::TYPE_WIRELESS ?>) ? '<?php echo Link_Model::NORM_802_11_G ?>' : null);
|
||
|
$('#wireless_frequency').val(null);
|
||
| freenetis/branches/1.2/application/views/js/transfers_payment_calculator.php | ||
|---|---|---|
|
data: {calculate: calculate, amount: amount, expiration_date: expiration_date},
|
||
|
success: function (data) {
|
||
|
$('#'+calculate).val(data);
|
||
|
<?php if($show_qr): ?>
|
||
|
var accountNumber = "<?php echo $account_nr ?>";
|
||
|
var bankCode = "<?php echo $bank_nr ?>";
|
||
|
var currency = "<?php echo Settings::get('currency') ?>";
|
||
|
var vs = "<?php echo $variable_symbol ?>";
|
||
|
<?php if ($bank_nr != ''): ?>
|
||
|
$('#qrpay').attr('src', 'http://api.paylibo.com/paylibo/generator/czech/image?accountNumber='+accountNumber+'&bankCode='+bankCode+'&amount='+$('#amount').val()+'¤cy='+currency+'&vs='+vs+'&size=100');
|
||
|
<?php endif; ?>
|
||
|
<?php endif; ?>
|
||
|
},
|
||
|
error: function () {
|
||
|
$('#'+calculate).val('');
|
||
|
$('#qrpay').attr('src', '');
|
||
|
alert('<?php echo __('Error during obtaining data from server') ?>');
|
||
|
},
|
||
|
dataType: 'html',
|
||
| ... | ... | |
|
else
|
||
|
{
|
||
|
$('#'+calculate).val('');
|
||
|
$('#qrpay').attr('src', '');
|
||
|
}
|
||
|
|
||
|
$('.add_link').attr('href', '<?php echo url_lang::base() ?>transfers/add_member_fee_payment_by_cash/<?php echo $member_id ?>/'+parseFloat($('#amount').val()))
|
||
| ... | ... | |
|
<?php if ($can_add): ?>
|
||
|
$('#amount', context).css('width', parseInt($('#amount', context).css('width'))-23);
|
||
|
$('<a href="<?php echo url_lang::base() ?>transfers/add_member_fee_payment_by_cash/<?php echo $member_id ?>" class="add_link popup_link"><img class="purse" src="<?php echo url::base() ?>media/images/icons/purse.png" width="16" height="16"></a>').insertAfter($('#amount', context));
|
||
|
<?php endif ?>
|
||
|
<?php endif ?>
|
||
|
|
||
|
$('#amount').parents('form').after('<img id="qrpay" src="" />');
|
||
| freenetis/branches/1.2/application/views/login/index.php | ||
|---|---|---|
|
<title><?php echo $title ?> | <?php echo $this->settings->get('title') ?></title>
|
||
|
<?php echo html::link('media/images/favicon.ico', 'shorcut icon', 'image/x-icon', FALSE); ?>
|
||
|
<?php echo html::stylesheet('media/css/installation.css', 'screen') ?>
|
||
|
<?php echo html::stylesheet('media/css/m.installation.css', 'handheld, screen and (max-device-width: 640px)') ?>
|
||
|
<style type="text/css"><!--
|
||
|
table.form th, table.form td {
|
||
|
border-bottom-width: 0px;
|
||
| freenetis/branches/1.2/application/views/main.php | ||
|---|---|---|
|
<?php
|
||
|
if ($this->axo_doc_access)
|
||
|
{
|
||
|
echo '<a href="'.AXODOC_URL.'?controller='.urlencode(url::slice(url::current(), 1, 2)).'" class="action_field_icon" target="_blank">' . html::image(array
|
||
|
echo '<a href="'.AXODOC_URL.'?controller='.urlencode(url::slice(url::current(), 1, 2)).'" class="action_field_icon cellphone_hide" target="_blank">' . html::image(array
|
||
|
(
|
||
|
'src' => 'media/images/layout/axodoc.png',
|
||
|
'alt' => __('Show AXO documentation (required access rights) for this page'),
|
||
| freenetis/branches/1.2/media/css/m.installation.css | ||
|---|---|---|
|
/*
|
||
|
Mobile device style
|
||
|
*/
|
||
|
|
||
|
@media only screen and (max-device-width : 640px) { /* firefox 3 require this to work properly */
|
||
|
#main {
|
||
|
width: 100% !important;
|
||
|
}
|
||
|
|
||
|
#main h1 {
|
||
|
margin: 0 auto;
|
||
|
}
|
||
|
|
||
|
#main h1 i {
|
||
|
margin: 0;
|
||
|
display: block;
|
||
|
top: 12px;
|
||
|
position: relative;
|
||
|
text-align: right;
|
||
|
right: 5px;
|
||
|
}
|
||
|
|
||
|
#main .flags {
|
||
|
text-align: center;
|
||
|
float: none;
|
||
|
margin: 25px 0 0 0;
|
||
|
}
|
||
|
}
|
||
| freenetis/branches/1.2/media/css/m.style.css | ||
|---|---|---|
|
|
||
|
@media only screen and (max-device-width : 640px) { /* firefox 3 require this to work properly */
|
||
|
|
||
|
#main {
|
||
|
.cellphone #main {
|
||
|
background-image: none;
|
||
|
width: auto;
|
||
|
max-width: none;
|
||
|
min-width: 0;
|
||
|
}
|
||
|
|
||
|
#middle {
|
||
|
.cellphone #middle {
|
||
|
font-size: 120%;
|
||
|
-webkit-text-size-adjust: 100%;
|
||
|
}
|
||
|
|
||
|
#header, #content, #footer {
|
||
|
.cellphone #header, #content, #footer {
|
||
|
width: 100%;
|
||
|
}
|
||
|
|
||
|
#content {
|
||
|
.cellphone #content {
|
||
|
margin-left: 0px;
|
||
|
max-width: none;
|
||
|
min-width: 0;
|
||
|
}
|
||
|
|
||
|
#content-padd {
|
||
|
.cellphone #content-padd {
|
||
|
max-width: none;
|
||
|
min-width: 0;
|
||
|
}
|
||
|
|
||
|
#footer {
|
||
|
.cellphone #footer {
|
||
|
display: none;
|
||
|
}
|
||
|
|
||
|
#menu {
|
||
|
.cellphone #menu {
|
||
|
background-color: #fff;
|
||
|
position: absolute;
|
||
|
width: 100%;
|
||
| ... | ... | |
|
display: none;
|
||
|
}
|
||
|
|
||
|
#content.dispNone {
|
||
|
.cellphone #content.dispNone {
|
||
|
display: none;
|
||
|
}
|
||
|
|
||
|
#cellphone_hide_menu {
|
||
|
.cellphone #cellphone_hide_menu {
|
||
|
width: 50px;
|
||
|
position: absolute;
|
||
|
height: 100%;
|
||
| ... | ... | |
|
cursor: pointer;
|
||
|
}
|
||
|
|
||
|
#cellphone_show_menu {
|
||
|
.cellphone #cellphone_show_menu {
|
||
|
top: 24px;
|
||
|
left: 18px;
|
||
|
background: #FF5C00 url('../../media/images/layout/logo_freenetis.jpg') no-repeat -1px 0px;
|
||
| ... | ... | |
|
cursor: pointer;
|
||
|
}
|
||
|
|
||
|
#cellphone_menu_tooltip {
|
||
|
.cellphone #cellphone_menu_tooltip {
|
||
|
display: none;
|
||
|
text-align: left;
|
||
|
background-color: #FF833D;
|
||
| ... | ... | |
|
opacity: 0.9;
|
||
|
}
|
||
|
|
||
|
h1#logo {
|
||
|
.cellphone h1#logo {
|
||
|
display: none;
|
||
|
}
|
||
|
|
||
|
.cellphone_hide {
|
||
|
display: none;
|
||
|
.cellphone .cellphone_hide,
|
||
|
.cellphone a.action_field_icon.cellphone_hide {
|
||
|
display: none !important;
|
||
|
}
|
||
|
|
||
|
#header .separator1 {
|
||
|
.cellphone #header .separator1 {
|
||
|
left: 75px;
|
||
|
}
|
||
|
|
||
|
#header .status {
|
||
|
.cellphone #header .status {
|
||
|
left: 87px;
|
||
|
}
|
||
|
|
||
|
#header .logout {
|
||
|
.cellphone #header .logout {
|
||
|
top: 64px;
|
||
|
}
|
||
|
|
||
|
#menu-padd {
|
||
|
.cellphone #menu-padd {
|
||
|
width: 240px;
|
||
|
}
|
||
|
|
||
|
table.form {
|
||
|
.cellphone table.form {
|
||
|
width: auto ! important;
|
||
|
}
|
||
|
|
||
|
table.extended {
|
||
|
.cellphone table.extended {
|
||
|
float: none ! important;
|
||
|
margin-left: 0 ! important;
|
||
|
}
|
||
|
|
||
|
#loading-overlay {
|
||
|
.cellphone #loading-overlay {
|
||
|
left: 0;
|
||
|
top: 95px;
|
||
|
}
|
||
|
|
||
|
.status div#user_ip_address {
|
||
|
.cellphone .status div#user_ip_address {
|
||
|
display: inline-block;
|
||
|
width: 90px;
|
||
|
overflow: hidden;
|
||
|
font-weight: normal;
|
||
|
}
|
||
|
|
||
|
input, textarea {
|
||
|
.cellphone input, .cellphone textarea {
|
||
|
margin: 0 ! important;
|
||
|
max-width: 100px ! important;
|
||
|
}
|
||
|
|
||
|
textarea {
|
||
|
.cellphone textarea {
|
||
|
width: 100% ! important;
|
||
|
max-width: 100% ! important;
|
||
|
padding: 0;
|
||
| ... | ... | |
|
box-sizing: border-box;
|
||
|
}
|
||
|
|
||
|
select {
|
||
|
.cellphone select {
|
||
|
margin: 0 ! important;
|
||
|
max-width: 100px ! important;
|
||
|
}
|
||
|
|
||
|
.search input#keyword {
|
||
|
.cellphone .search input#keyword {
|
||
|
max-width: 210px ! important;
|
||
|
width: 210px;
|
||
|
}
|
||
Také k dispozici: Unified diff
Opravy:
- fixes #912: Duplikace adresnich bodu bez c.p.
- fixes #832: Oprava nefukcniho menu pri zobrazeni v desktop modu na mobilu
Upravy:
- closes #860: Uzpusobeni prihlasovaci obrazovky pro mobilni zarizeni
- closes #686: Generovani QR kodu pro QR platbu
- Moznost filtrovani podle mestske casti
- Skryti AXOdoc tlacitka v mobilni verzi
- Automaticke nastaveni duplexni linky u rozhrani typu ethernet a port pri pridavani noveho rozhrani k zarizeni
- Predvyplneni adresy zarizeni pri pridavani noveho zarizeni