From 067d7dc9f708d5ebeda1072fb6dc82e960de0d81 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 28 May 2018 14:57:54 +0200 Subject: treewide: convert HTML tables to div Mostly convert HTML tables to div based markup to allow for easier styling in the future. Also change JS accessor code accordingly. Signed-off-by: Jo-Philipp Wich --- .../luasrc/view/asterisk/dialplans.htm | 60 +++++++++--------- .../luasrc/view/asterisk/dialzones.htm | 74 +++++++++++----------- 2 files changed, 67 insertions(+), 67 deletions(-) (limited to 'applications/luci-app-asterisk') diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm index 9f644ba074..fb40335f99 100644 --- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm +++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm @@ -79,23 +79,23 @@ <% for i, plan in pairs(ast.dialplan.plans()) do %>
- - - - - + + <% local zones_used = { }; local row = 0 %> <% for i, zone in ipairs(plan.zones) do zones_used[zone.name] = true %> - - - - + + <% row = row + 1; end %> <% local boxes_used = { } %> <% for ext, box in luci.util.kspairs(plan.voicemailboxes) do boxes_used[box.id] = true %> - - - - + + <% row = row + 1; end %> <% local rooms_used = { } %> <% for ext, room in luci.util.kspairs(plan.meetmerooms) do rooms_used[room.room] = true %> - - - - + + <% row = row + 1; end %> - - - + + -
+
+
+
Dialplan <%=plan.name%> -
+ +
Remove this dialplan -
+
+
└ Dialzone <%=zone.name%> (<%=zone.description%>)

Lines: @@ -107,24 +107,24 @@ Matches: <%=format_matches(zone)%>

-
+ +
Edit dialzone Remove from this dialplan -
+
+
└ Voicemailbox <%=box.id%> (<%=box.name%>)

Owner: <%=box.name%> | @@ -132,44 +132,44 @@ Pager: <%=#box.page > 0 and box.page or 'n/a'%>
Matches: <%=format_matches(ext)%>

-
+ +
Manage mailboxes ... Remove from this dialplan -
+
+
└ MeetMe Room <%=room.room%> <% if room.description and #room.description > 0 then %> (<%=room.description%>)<% end %>

Matches: <%=format_matches(ext)%>

-
+ +
Manage conferences ... Remove from this dialplan -
+
+
Add Dialzone:
@@ -213,10 +213,10 @@

-
+
diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm index ffdbbcf359..e48da608a6 100644 --- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm +++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm @@ -66,59 +66,59 @@
- - - - - - - - - - - - - + + + +
+
Name
+
Prepend
+
- Match
+
Trunk
+
Description
+
+
<% for i, rule in pairs(ast.dialzone.zones()) do %> - - - - - - - - + + <% end %> -
+
+
+

Dialzone Overview

-
NamePrepend- MatchTrunkDescription
+
+
<%=rule.name%> -
+ +
<% for _ in ipairs(rule.matches) do %> <%=rule.addprefix and digit_pattern(rule.addprefix)%> 
<% end %> -
+ +
<% for _, m in ipairs(rule.matches) do %> <%=rule.localprefix and "%s " % digit_pattern(rule.localprefix)%> <%=digit_pattern(m)%>
<% end %> -
+ +
<%=ast.tools.hyperlinks( rule.trunks, function(v) return luci.dispatcher.build_url("admin", "asterisk", "trunks", "%s") % v:lower() end )%> -
+ +
<%=rule.description or rule.name%> -
+ +
Edit entry Delete entry -
+

@@ -133,26 +133,26 @@
Invalid name given!
<% end -%> - - - - - -
+
+
+




-
+ +

-
+ + +
-- cgit v1.2.3