applications/luci-asterisk: add meetme support, data integrity improvements

[project/luci.git] / applications / luci-asterisk / luasrc / view / asterisk / dialplans.htm

diff --git a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
index 79b81bd..a360162 100644 (file)
--- a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
+++ b/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
@@ -78,7 +78,8 @@ $Id$
                Here you can manage your dial plans which are used to route outgoing calls from your local extensions.<br /><br />
                Related tasks:<br />
                <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans/zones')%>" class="cbi-title-ref">Manage dialzones</a> |
-               <a href="<%=luci.dispatcher.build_url('admin/asterisk/voicemail/mailboxes')%>" class="cbi-title-ref">Manage voicemail boxes</a>
+               <a href="<%=luci.dispatcher.build_url('admin/asterisk/voicemail/mailboxes')%>" class="cbi-title-ref">Manage voicemail boxes</a> |
+               <a href="<%=luci.dispatcher.build_url('admin/asterisk/meetme/rooms')%>" class="cbi-title-ref">Manage meetme rooms</a>
        </div>
        <!-- tblsection -->
        <fieldset class="cbi-section" id="cbi-asterisk-sip">
@@ -117,10 +118,10 @@ $Id$
                                                </p>
                                        </td>
                                        <td style="width:5%" class="cbi-value-field">
-                                               <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans', 'out', zone.name)%>">
+                                               <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans/out', zone.name)%>">
                                                        <img style="border:none" alt="Edit dialzone" title="Edit dialzone" src="/luci-static/resources/cbi/edit.gif" />
                                                </a>
-                                               <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans')%>?delzone.<%=plan.name%>=<%=zone.name%>">
+                                               <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans')%>?delzone.<%=plan.name%>=<%=zone.name%>">
                                                        <img style="border:none" alt="Remove from this dialplan" title="Remove from this dialplan" src="/luci-static/resources/cbi/remove.gif" />
                                                </a>
                                        </td>
@@ -142,10 +143,10 @@ $Id$
                                                </p>
                                        </td>
                                        <td style="width:5%" class="cbi-value-field">
-                                               <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans', 'out', box.name)%>">
+                                               <a href="<%=luci.dispatcher.build_url('admin/asterisk/voicemail/mailboxes')%>">
                                                        <img style="border:none" alt="Edit dialzone" title="Edit dialzone" src="/luci-static/resources/cbi/edit.gif" />
                                                </a>
-                                               <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans')%>?delvbox.<%=plan.name%>=<%=ext%>">
+                                               <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans')%>?delvbox.<%=plan.name%>=<%=ext%>">
                                                        <img style="border:none" alt="Remove from this dialplan" title="Remove from this dialplan" src="/luci-static/resources/cbi/remove.gif" />
                                                </a>
                                        </td>
@@ -153,6 +154,28 @@ $Id$
                                <% row = row + 1; end %>
                                <!-- /voicemail -->
 
+                               <!-- meetme -->
+                               <% local rooms_used = { } %>
+                               <% for ext, room in luci.util.kspairs(plan.meetmerooms) do rooms_used[room.room] = true %>
+                               <tr class="cbi-section-table-row <%=rowstyle(row)%>">
+                                       <td style="text-align: left; padding: 3px" class="cbi-section-table-cell">
+                                               <strong>&#x2514; MeetMe Room <em><%=room.room%></em></strong> (<%=room.description%>)
+                                               <p style="padding-left: 1em; margin-bottom:0">
+                                                       Matches: <%=format_matches(ext)%>
+                                               </p>
+                                       </td>
+                                       <td style="width:5%" class="cbi-value-field">
+                                               <a href="<%=luci.dispatcher.build_url('admin/asterisk/meetme/rooms')%>">
+                                                       <img style="border:none" alt="Edit dialzone" title="Edit dialzone" src="/luci-static/resources/cbi/edit.gif" />
+                                               </a>
+                                               <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans')%>?delmeetme.<%=plan.name%>=<%=ext%>">
+                                                       <img style="border:none" alt="Remove from this dialplan" title="Remove from this dialplan" src="/luci-static/resources/cbi/remove.gif" />
+                                               </a>
+                                       </td>
+                               </tr>
+                               <% row = row + 1; end %>
+                               <!-- /meetme -->
+
                                <tr class="cbi-section-table-row">
                                        <td style="text-align: left; padding: 3px" class="cbi-section-table-cell" colspan="2">
                                                <hr style="margin-bottom:0.5em; border-width:0 0 1px 0" />
@@ -181,6 +204,19 @@ $Id$
                                                <input type="text" style="width:5%" name="addvboxext.<%=plan.name%>" />
                                                <br /><br />
 
+                                               Add MeetMe Conference:<br />
+                                               <select style="width:20%" name="addmeetme.<%=plan.name%>" onchange="this.form['addmeetmeext.<%=plan.name%>'].value=this.options[this.selectedIndex].value">
+                                                       <option value="">-- please select --</option>
+                                                       <% for ext, room in luci.util.kspairs(ast.meetme.rooms()) do %>
+                                                               <%# if not rooms_used[room.room] then %>
+                                                                       <option value="<%=room.room%>"><%=room.room%> (<%=room.description%>)</option>
+                                                               <%# end %>
+                                                       <% end %>
+                                               </select>
+                                               as extension
+                                               <input type="text" style="width:5%" name="addmeetmeext.<%=plan.name%>" />
+                                               <br /><br />
+
                                                <input type="submit" class="cbi-button cbi-button-add" value="Add item &raquo;" title="Add item ..."/>
                                        </td>
                                </tr>