sipwise
/
www_admin
mirror of https://github.com/sipwise/www_admin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

some layout corrections and error/success messages

Browse Source
2.0@2434
Daniel Tiefnig 17 years ago
parent dec981c2af
commit 01e26f774e
5 changed files with 86 additions and 94 deletions
Show Stats Download Patch File Download Diff File

23
lib/admin/Controller/domain.pm
Unescape View File

@ -196,6 +196,7 @@ sub detail : Local {
$c->stash->{audio_files} = $$audio_files{result} if eval { @{$$audio_files{result}} };
$c->stash->{edit_audio} = $c->request->params->{edit_audio};
$c->stash->{delete_audio} = $c->request->params->{daf};
if(exists $c->session->{acrefill}) {
$c->stash->{acrefill} = $c->session->{acrefill};
@ -445,17 +446,13 @@ sub do_update_audio : Local {
my $upload = $c->req->upload('eupload_audio');
$settings{data}{audio} = eval { $upload->slurp } if defined $upload;
unless(keys %messages) {
if($c->model('Provisioning')->call_prov( $c, 'voip', 'update_audio_file',
\%settings,
undef))
{
$messages{audiomsg} = 'Web.AudioFile.Updated';
$c->session->{messages} = \%messages;
$c->response->redirect("/domain/detail?domain=$settings{domain}#audio");
return;
}
$c->response->redirect("/domain/detail?domain=$settings{domain}&edit_audio=$settings{handle}#audio");
if($c->model('Provisioning')->call_prov( $c, 'voip', 'update_audio_file',
\%settings,
undef))
{
$messages{audiomsg} = 'Web.AudioFile.Updated';
$c->session->{messages} = \%messages;
$c->response->redirect("/domain/detail?domain=$settings{domain}#audio");
return;
}
@ -492,12 +489,12 @@ sub do_delete_audio : Local {
\%settings,
undef))
{
$c->session->{messages} = { provmsg => 'Web.AudioFile.Deleted' };
$c->session->{messages} = { audiomsg => 'Web.AudioFile.Deleted' };
$c->response->redirect("/domain/detail?domain=$settings{domain}#audio");
return;
}
$c->response->redirect("/domain/detail?domain=$settings{domain}#audio");
$c->response->redirect("/domain/detail?domain=$settings{domain}&daf=$settings{handle}#audio");
return;
}

4
lib/admin/Controller/ncos.pm
Unescape View File

@ -117,7 +117,7 @@ sub do_update_level : Local {
\%settings,
undef))
{
$messages{provmsg} = 'Web.NCOSLevel.Updated';
$messages{elvlmsg} = 'Web.NCOSLevel.Updated';
$c->session->{messages} = \%messages;
$c->response->redirect("/ncos");
return;
@ -153,7 +153,7 @@ sub do_delete_level : Local {
\%settings,
undef))
{
$c->session->{messages} = { provmsg => 'Web.NCOSLevel.Deleted' };
$c->session->{messages} = { elvlmsg => 'Web.NCOSLevel.Deleted' };
$c->response->redirect("/ncos");
return;
}

4
root/css/admin.css
Unescape View File

@ -370,6 +370,10 @@ h3 {
#contentplace .search_subscriber input {
margin: 3px 0;
}
#contentplace .search_subscriber select {
min-width: 50px;
margin: 3px 0;
}
/* increase spacing around list explanation text */
#contentplace .list_explanation {

87
root/tt/domain_detail.tt
Unescape View File

@ -165,6 +165,9 @@
</form>
</td>
</tr>
[% IF audio.handle == delete_audio && prov_error %]
<tr><td colspan="5"><div class="errormsg">[% prov_error %]</div></td></tr>
[% END %]
[% END %]
[% END %]
<tr>
@ -274,46 +277,50 @@
</tr>
[% END %]
[% END %]
<tr>
<form action="/domain/do_create_vsc" method="post">
<td>
<select size="1" name="action"
title="the VSC action that should be triggered">
[% FOREACH action = vsc_actions %]
<option value="[% action %]"
[% IF vcrefill.action == action %]selected="selected"[% END %]
>[% action %]</option>
[% END %]
</select>
</td>
<td>
<input type="text" maxlength="2" class="irealshort" title="two-digit dialcode for VoIP devices"
name="digits" value="[% vcrefill.data.digits %]" />
</td>
<td>
<select size="1" name="audio_file_handle"
title="the audio which will be played after execution">
[% FOREACH audio = audio_files %]
<option value="[% audio.handle %]"
[% IF vcrefill.data.audio_file_handle == audio.handle %]selected="selected"[% END %]
>[% audio.handle %]</option>
[% END %]
</select>
</td>
<td>
<input type="text" class="iaudiodesc" title="free-form description string"
name="description" value="[% vcrefill.data.description %]" />
</td>
<td>
<input type="hidden" name="domain" value="[% domain.domain %]" />
<div class="postlink">
<label for="vscadd">add</label>
<input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="vscadd" />
</div>
</td>
</form>
<td />
</tr>
[% IF vsc_actions %]
<tr>
<form action="/domain/do_create_vsc" method="post">
<td>
<select size="1" name="action"
title="the VSC action that should be triggered">
[% FOREACH action = vsc_actions %]
<option value="[% action %]"
[% IF vcrefill.action == action %]selected="selected"[% END %]
>[% action %]</option>
[% END %]
</select>
</td>
<td>
<input type="text" maxlength="2" class="irealshort" title="two-digit dialcode for VoIP devices"
name="digits" value="[% vcrefill.data.digits %]" />
</td>
<td>
<select size="1" name="audio_file_handle"
title="the audio which will be played after execution">
[% FOREACH audio = audio_files %]
<option value="[% audio.handle %]"
[% IF vcrefill.data.audio_file_handle == audio.handle %]selected="selected"[% END %]
>[% audio.handle %]</option>
[% END %]
</select>
</td>
<td>
<input type="text" class="iaudiodesc" title="free-form description string"
name="description" value="[% vcrefill.data.description %]" />
</td>
<td>
<input type="hidden" name="domain" value="[% domain.domain %]" />
<div class="postlink">
<label for="vscadd">add</label>
<input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="vscadd" />
</div>
</td>
</form>
<td />
</tr>
[% ELSE %]
<tr><td colspan="6" class="tdcenter">No undefined VSC actions found.</td></tr>
[% END %]
</table>
[% IF vcrefill && prov_error %]<div class="errormsg">[% prov_error %]</div>[% END %]
</div>

62
root/tt/lnp.tt
Unescape View File

@ -80,7 +80,7 @@
</table>
[% IF messages.paddidmsg %]<div class="errormsg">[% messages.paddidmsg %]</div>[% END %]
[% IF messages.paddnamsg %]<div class="errormsg">[% messages.paddnamsg %]</div>[% END %]
</div>
</div>
[% UNLESS Catalyst.session.admin.read_only %]
<h3 id="create_number">Add Ported Number</h3>
@ -88,39 +88,24 @@
<div class="p1">
[% IF messages.cnumsg %]<div class="goodmsg">[% messages.cnumsg %]</div>[% END %]
[% IF narefill && prov_error %]<div class="errormsg">[% prov_error %]</div>[% END %]
<form action="/lnp/do_create_number" method="post">
<table>
<tr>
<td>number</td>
<td><input type="text" name="number" value="[% narefill.number %]"
title="E.164 phone number with intl. prefix" />
</td>
</tr>
<tr>
<td>provider</td>
<td>
<select size="1" name="lnp_provider_id">
[% FOREACH provider = providers %]
<option value="[% provider.id %]"
[% IF narefill.lnp_provider_id == provider.id %]selected="selected"[% END %]
>[% provider.name %]</option>
[% END %]
</select>
</td>
</tr>
<tr>
<td>start</td>
<td><input type="text" name="start" value="[% narefill.start %]"
title="SQL date or timestamp in &quot;YYYY-MM-DD hh:mm:ss&quot; format" />
</td>
</tr>
<tr>
<td>end</td>
<td><input type="text" name="end" value="[% narefill.end %]"
title="SQL date or timestamp in &quot;YYYY-MM-DD hh:mm:ss&quot; format" />
</td>
</tr>
</table>
<form action="/lnp/do_create_number" method="post" class="search_subscriber">
<label class="search_label" for="numaddnum">Number:</label>
<input type="text" name="number" id="numaddnum" value="[% narefill.number %]"
title="E.164 phone number with country code" /><br />
<label class="search_label" for="numaddprov">Provider:</label>
<select size="1" name="lnp_provider_id" id="numaddprov">
[% FOREACH provider = providers %]
<option value="[% provider.id %]"
[% IF narefill.lnp_provider_id == provider.id %]selected="selected"[% END %]
>[% provider.name %]</option>
[% END %]
</select><br />
<label class="search_label" for="numaddstart">Start:</label>
<input type="text" id="numaddstart" name="start" value="[% narefill.start %]"
title="SQL date or timestamp in &quot;YYYY-MM-DD hh:mm:ss&quot; format" /><br />
<label class="search_label" for="numaddend">End:</label>
<input type="text" id="numaddend" name="end" value="[% narefill.end %]"
title="SQL date or timestamp in &quot;YYYY-MM-DD hh:mm:ss&quot; format" /><br />
<input type="submit" value="Add &#187;" class="but" />
</form>
</div>
@ -132,17 +117,16 @@
<form action="lnp/search_numbers" method="post" class="search_subscriber">
<label class="search_label" for="search_by_provid">Provider:</label>
<select size="1" name="search_provid">
<option value="0" [% UNLESS nerefill.lnp_provider_id %]selected="selected"[% END %] />
<option value="0" [% UNLESS nerefill.lnp_provider_id %]selected="selected"[% END %]>&nbsp;</option>
[% FOREACH provider = providers %]
<option value="[% provider.id %]"
[% IF searched_numbers.lnp_provider_id == provider.id %]selected="selected"[% END %]
>[% provider.name %]</option>
[% END %]
</select><br clear="all" />
</select><br />
<label class="search_label" for="search_by_number">Number:</label>
<input type="text" id="search_by_number" name="search_number" title="SQL wildcards allowed"
value="[% searched_numbers.number %]"
value="[% search_number %]" />
value="[% searched_numbers.number %]" />
<input type="checkbox" id="exact_number" name="exact_number"
[% IF searched_numbers.exact_number %]checked="checked"[% END %] />
<label for="exact_number">exact match</label><br />
@ -177,7 +161,7 @@
<tr>
[% END %]
<td><input type="text" class="ilnpnumedit" name="number" value="[% nerefill.number %]"
title="E.164 phone number with intl. prefix" />
title="E.164 phone number with country code" />
</td>
<td>
<select size="1" class="ilnpproedit" name="lnp_provider_id">

Write Preview
Loading…
Cancel
Save