diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-03-30 19:53:07 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-03-30 19:53:07 +0000 |
| commit | 1a8cae287428a011377e68cd4ac01e6a9cf1a82a (patch) | |
| tree | 76f4397916b727c6f653b2344333de323a501cd0 /applications | |
| parent | 7056ef8bac7b4f31aeee92a8b6ac34011e9f1df1 (diff) | |
applications/luci-asterisk: adept meetme example in default config to current format, layout fixes in dialplan overview
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm | 8 | ||||
| -rw-r--r-- | applications/luci-asterisk/root/etc/config/asterisk | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm index 2c6895b929..a46a8db179 100644 --- a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm +++ b/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm @@ -159,7 +159,8 @@ $Id$ <% 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>└ MeetMe Room <em><%=room.room%></em></strong> (<%=room.description%>) + <strong>└ MeetMe Room <em><%=room.room%></em></strong> + <% if room.description and #room.description > 0 then %> (<%=room.description%>)<% end %> <p style="padding-left: 1em; margin-bottom:0"> Matches: <%=format_matches(ext)%> </p> @@ -209,7 +210,10 @@ $Id$ <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> + <option value="<%=room.room%>"> + <%=room.room%> + <% if room.description and #room.description > 0 then %>(<%=room.description%>)<% end %> + </option> <%# end %> <% end %> </select> diff --git a/applications/luci-asterisk/root/etc/config/asterisk b/applications/luci-asterisk/root/etc/config/asterisk index 9ab00efe07..248409793c 100644 --- a/applications/luci-asterisk/root/etc/config/asterisk +++ b/applications/luci-asterisk/root/etc/config/asterisk @@ -220,7 +220,8 @@ config 'dialzone' 'international' config 'meetmegeneral' option 'audiobuffers' '32' -config 'meetme' '101' +config 'meetme' + option 'room' '101' option 'pin' '' option 'adminpin' '' |