summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-admin-full/luasrc/view/admin_system
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-10-07 19:07:36 +0200
committerJo-Philipp Wich <jow@openwrt.org>2015-10-07 19:07:36 +0200
commit281d2f617899a0c3a171a66c6a3a14e834aa000c (patch)
tree4b53f67e82b64bb506b3a219a29319b64d1c1ab2 /modules/luci-mod-admin-full/luasrc/view/admin_system
parent49a2cb5ad11ccc0225fd3fa1de4b85a0618bbb99 (diff)
Globally replace luci.dispatcher.build_url(...) with url(...) invocations
Also concat multiple string arguments into one while we're at it. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Diffstat (limited to 'modules/luci-mod-admin-full/luasrc/view/admin_system')
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm4
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm2
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
index 0a6df109df..c1f3361ae2 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
@@ -5,6 +5,6 @@
-%>
<ul class="cbi-tabmenu">
- <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/system/flashops")%>"><%:Actions%></a></li>
+ <li class="cbi-tab-disabled"><a href="<%=url("admin/system/flashops")%>"><%:Actions%></a></li>
<li class="cbi-tab"><a href="#"><%:Configuration%></a></li>
</ul>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm
index 84e151075f..19be072fef 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm
@@ -1,7 +1,7 @@
<%+cbi/valueheader%>
<script type="text/javascript">//<![CDATA[
- XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "system", "clock_status")%>', null,
+ XHR.poll(5, '<%=url('admin/system/clock_status')%>', null,
function(x, rv)
{
var s = document.getElementById('<%=self.option%>-clock-status');
@@ -17,7 +17,7 @@
btn.disabled = true;
btn.value = '<%:Synchronizing...%>';
- XHR.get('<%=luci.dispatcher.build_url("admin", "system", "clock_status")%>',
+ XHR.get('<%=url('admin/system/clock_status')%>',
{ set: Math.floor((new Date()).getTime() / 1000) },
function()
{
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
index 6b812e837e..a7ff4e50bd 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
@@ -5,6 +5,6 @@
-%>
<ul class="cbi-tabmenu">
- <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/system/packages")%>"><%:Actions%></a></li>
+ <li class="cbi-tab-disabled"><a href="<%=url("admin/system/packages")%>"><%:Actions%></a></li>
<li class="cbi-tab"><a href="#"><%:Configuration%></a></li>
</ul>