Skip to content

Commit 9021d7f

Browse files
author
Marius Cramer
committed
- cleaned up javascript
1 parent 2d0ebad commit 9021d7f

23 files changed

+789
-824
lines changed

‎interface/lib/classes/listform.inc.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -354,23 +354,23 @@ public function getPagingHTML($vars)
354354

355355
//* Show Back
356356
if(isset($vars['show_page_back']) && $vars['show_page_back'] == 1){
357-
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page=0'.$vars['page_params']."');".'" aria-label="First">
357+
$content .= '<li><a href="#" data-load-content="'.$vars['list_file'].'?page=0'.$vars['page_params'].'" aria-label="First">
358358
<span aria-hidden="true">&laquo;</span></a></li>';
359-
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params']."');".'" aria-label="Previous">
359+
$content .= '<li><a href="#" data-load-content='.$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params'].'" aria-label="Previous">
360360
<span aria-hidden="true">&lsaquo;</span></a></li>';
361361
}
362362
$prev = -1;
363363
foreach($show_pages as $p) {
364364
if($prev != -1 && $p > $prev + 1) $content .= '<li class="disabled"><a href="#">…</a></li>';
365-
$content .= '<li' . ($p == $vars['page'] ? ' class="active"' : '') . '><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$p.$vars['page_params']."');".'">'. ($p+1) .'</a></li>';
365+
$content .= '<li' . ($p == $vars['page'] ? ' class="active"' : '') . '><a href="#" data-load-content="'.$vars['list_file'].'?page='.$p.$vars['page_params'].'">'. ($p+1) .'</a></li>';
366366
$prev = $p;
367367
}
368368
//.$vars['next_page'].' '.$this->lng('page_of_txt').' '.$vars['max_pages'].' &nbsp; ';
369369
//* Show Next
370370
if(isset($vars['show_page_next']) && $vars['show_page_next'] == 1){
371-
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params']."');".'" aria-label="Next">
371+
$content .= '<li><a href="#" data-load-content="'.$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params'].'" aria-label="Next">
372372
<span aria-hidden="true">&rsaquo;</span></a></li>';
373-
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['pages'].$vars['page_params']."');".'" aria-label="Last">
373+
$content .= '<li><a href="#" data-load-content="'.$vars['list_file'].'?page='.$vars['pages'].$vars['page_params'].'" aria-label="Last">
374374
<span aria-hidden="true">&raquo;</span></a></li>';
375375
}
376376
$content .= '</ul></nav>';

‎interface/lib/classes/listform_tpl_generator.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function buildHTML($listDef, $module = '') {
4444
<div class="pnl_toolsarea">
4545
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
4646
<div class="buttons">
47-
<button class="iconstxt icoAdd" type="button" onclick="'."loadContent('".$module."/".$listDef["edit_file"]."');".'">
47+
<button class="iconstxt icoAdd" type="button" data-load-content="'.$module."/".$listDef["edit_file"].'">
4848
<span>{tmpl_var name="add_new_record_txt"}</span>
4949
</button>
5050
</div>
@@ -91,7 +91,7 @@ function buildHTML($listDef, $module = '') {
9191

9292
foreach($listDef["item"] as $field) {
9393
$key = $field["field"];
94-
$html .= " <td class=\"tbl_col_".$key."\"><a href=\"#\" onclick=\"loadContent('".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}');\">{tmpl_var name=\"".$key."\"}</a></td>\n";
94+
$html .= " <td class=\"tbl_col_".$key."\"><a href=\"#\" data-load-content=\"".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}\">{tmpl_var name=\"".$key."\"}</a></td>\n";
9595
}
9696

9797
$html .= " <td class=\"tbl_col_buttons\">

‎interface/lib/classes/tform_tpl_generator.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ function buildHTML($formDef, $tab) {
137137
138138
<div class=\"buttonHolder buttons\">
139139
<button class=\"positive iconstxt icoPositive\" type=\"button\" value=\"{tmpl_var name='btn_save_txt'}\" onclick=\"submitForm('pageForm','".$module."/".$formDef["action"]."');\"><span>{tmpl_var name='btn_save_txt'}</span></button>
140-
<button class=\"negative iconstxt icoNegative\" type=\"button\" value=\"{tmpl_var name='btn_cancel_txt'}\" onclick=\"loadContent('".$module."/".$formDef["list_default"]."');\"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
140+
<button class=\"negative iconstxt icoNegative\" type=\"button\" value=\"{tmpl_var name='btn_cancel_txt'}\" data-load-content=\"".$module."/".$formDef["list_default"]."\"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
141141
</div>
142142
</div>
143143

‎interface/web/admin/software_package_list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
if($p['package_installable'] == 'no') {
166166
$installed_txt .= $s['server_name'].": ".$app->lng("Package can not be installed.")."<br />";
167167
} else {
168-
$installed_txt .= $s['server_name'].": <a href=\"#\" onclick=\"loadContent('admin/software_package_install.php?package=".$p["package_name"]."&server_id=".$s["server_id"]."');\">Install now</a><br />";
168+
$installed_txt .= $s['server_name'].": <a href=\"#\" data-load-content=\"admin/software_package_install.php?package=".$p["package_name"]."&server_id=".$s["server_id"]."\">Install now</a><br />";
169169
}
170170
}
171171
}

‎interface/web/admin/software_update_list.php‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -176,38 +176,14 @@
176176

177177
foreach($updates as $key => $u) {
178178
$version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4'];
179-
$installed_txt = "<a href=\"#\" onclick=\"loadContent('admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."');\">Install Update</a><br />";
179+
$installed_txt = "<a href=\"#\" data-load-content=\"admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."\">Install Update</a><br />";
180180
$records_out[] = array('version' => $version, 'update_title' => $u["update_title"], 'installed' => $installed_txt);
181181

182182
}
183183
}
184184
}
185185
}
186186

187-
/*
188-
$updates = $app->db->queryAllRecords('SELECT software_update.update_title, software_update.software_update_id, software_update.package_name, v1, v2, v3, v4, software_update_inst.status
189-
FROM software_update LEFT JOIN software_update_inst ON ( software_update.software_update_id = software_update_inst.software_update_id )
190-
WHERE server_id = '.$server_id.'
191-
GROUP BY software_update.package_name
192-
ORDER BY software_update.package_name ASC, v1 DESC , v2 DESC , v3 DESC , v4 DESC');
193-
194-
if(is_array($updates)) {
195-
foreach($updates as $key => $u) {
196-
$installed_txt = '';
197-
198-
$version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4'];
199-
$updates[$key]['version'] = $version;
200-
if($u['status'] == 'installed' || $u['status'] == 'installing' || $u['status'] == 'deleting') {
201-
$installed_txt .= "Installed version $version<br />";
202-
} else {
203-
$installed_txt .= "<a href=\"#\" onclick=\"loadContent('admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."');\">Install now</a><br />";
204-
}
205-
$updates[$key]['installed'] = $installed_txt;
206-
207-
}
208-
}
209-
*/
210-
211187

212188

213189
$app->tpl->setLoop('records', $records_out);

‎interface/web/admin/templates/system_config_branding_edit.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
1515
<input type="hidden" name="id" value="{tmpl_var name='id'}">
1616
<div class="buttonHolder buttons">
1717
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
18-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
18+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
1919
</div>
2020
</div>
2121

‎interface/web/dns/templates/dns_dmarc_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
9292

9393
<div class="buttonHolder buttons">
9494
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_dmarc_edit.php"><span>{tmpl_var name='btn_save_txt'}</span></button>
95-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
95+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
9696
</div>
9797
</div>
9898

‎interface/web/index.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@
5151
$app->tpl->setVar('global_tabchange_discard_txt', $app->lng('global_tabchange_discard_txt'));
5252
}
5353

54+
if($sys_config['use_loadindicator'] == 'y') {
55+
$app->tpl->setVar('use_loadindicator', 'y');
56+
}
57+
if($sys_config['use_combobox'] == 'y') {
58+
$app->tpl->setVar('use_combobox', 'y');
59+
}
60+
61+
5462
if(isset($_SESSION['show_info_msg'])) {
5563
$app->tpl->setVar('show_info_msg', $_SESSION['show_info_msg']);
5664
unset($_SESSION['show_info_msg']);

0 commit comments

Comments
 (0)