View | Details | Raw Unified | Return to bug 16092
Collapse All | Expand All

(-)a/admin/branches.pl (-8 / +8 lines)
Lines 93-99 if ( $op eq 'add_form' ) { Link Here
93
93
94
        eval { $library->store; };
94
        eval { $library->store; };
95
        if ($@) {
95
        if ($@) {
96
            push @messages, { type => 'error', code => 'error_on_update' };
96
            push @messages, { type => 'alert', code => 'error_on_update' };
97
        } else {
97
        } else {
98
            push @messages, { type => 'message', code => 'success_on_update' };
98
            push @messages, { type => 'message', code => 'success_on_update' };
99
        }
99
        }
Lines 107-113 if ( $op eq 'add_form' ) { Link Here
107
        eval { $library->store; };
107
        eval { $library->store; };
108
        $library->add_to_categories( \@categories );
108
        $library->add_to_categories( \@categories );
109
        if ($@) {
109
        if ($@) {
110
            push @messages, { type => 'error', code => 'error_on_insert' };
110
            push @messages, { type => 'alert', code => 'error_on_insert' };
111
        } else {
111
        } else {
112
            push @messages, { type => 'message', code => 'success_on_insert' };
112
            push @messages, { type => 'message', code => 'success_on_insert' };
113
        }
113
        }
Lines 126-132 if ( $op eq 'add_form' ) { Link Here
126
126
127
    if ( $items_count or $patrons_count ) {
127
    if ( $items_count or $patrons_count ) {
128
        push @messages,
128
        push @messages,
129
          { type => 'error',
129
          { type => 'alert',
130
            code => 'cannot_delete_library',
130
            code => 'cannot_delete_library',
131
            data => {
131
            data => {
132
                items_count   => $items_count,
132
                items_count   => $items_count,
Lines 147-153 if ( $op eq 'add_form' ) { Link Here
147
    my $deleted = eval { $library->delete; };
147
    my $deleted = eval { $library->delete; };
148
148
149
    if ( $@ or not $deleted ) {
149
    if ( $@ or not $deleted ) {
150
        push @messages, { type => 'error', code => 'error_on_delete' };
150
        push @messages, { type => 'alert', code => 'error_on_delete' };
151
    } else {
151
    } else {
152
        push @messages, { type => 'message', code => 'success_on_delete' };
152
        push @messages, { type => 'message', code => 'success_on_delete' };
153
    }
153
    }
Lines 173-179 if ( $op eq 'add_form' ) { Link Here
173
        $category->show_in_pulldown( $input->param('show_in_pulldown') eq 'on' );
173
        $category->show_in_pulldown( $input->param('show_in_pulldown') eq 'on' );
174
        eval { $category->store; };
174
        eval { $category->store; };
175
        if ($@) {
175
        if ($@) {
176
            push @messages, { type => 'error', code => 'error_on_update_category' };
176
            push @messages, { type => 'alert', code => 'error_on_update_category' };
177
        } else {
177
        } else {
178
            push @messages, { type => 'message', code => 'success_on_update_category' };
178
            push @messages, { type => 'message', code => 'success_on_update_category' };
179
        }
179
        }
Lines 186-192 if ( $op eq 'add_form' ) { Link Here
186
        $category->show_in_pulldown( $input->param('show_in_pulldown') eq 'on' );
186
        $category->show_in_pulldown( $input->param('show_in_pulldown') eq 'on' );
187
        eval { $category->store; };
187
        eval { $category->store; };
188
        if ($@) {
188
        if ($@) {
189
            push @messages, { type => 'error', code => 'error_on_insert_category' };
189
            push @messages, { type => 'alert', code => 'error_on_insert_category' };
190
        } else {
190
        } else {
191
            push @messages, { type => 'message', code => 'success_on_insert_category' };
191
            push @messages, { type => 'message', code => 'success_on_insert_category' };
192
        }
192
        }
Lines 197-203 if ( $op eq 'add_form' ) { Link Here
197
    my $libraries_count = scalar( $category->libraries );
197
    my $libraries_count = scalar( $category->libraries );
198
    if ( $libraries_count > 0 ) {
198
    if ( $libraries_count > 0 ) {
199
        push @messages,
199
        push @messages,
200
          { type => 'error',
200
          { type => 'alert',
201
            code => 'cannot_delete_category',
201
            code => 'cannot_delete_category',
202
            data => { libraries_count => $libraries_count, },
202
            data => { libraries_count => $libraries_count, },
203
          };
203
          };
Lines 210-216 if ( $op eq 'add_form' ) { Link Here
210
    my $deleted = eval { $category->delete; };
210
    my $deleted = eval { $category->delete; };
211
211
212
    if ( $@ or not $deleted ) {
212
    if ( $@ or not $deleted ) {
213
        push @messages, { type => 'error', code => 'error_on_delete_category' };
213
        push @messages, { type => 'alert', code => 'error_on_delete_category' };
214
    } else {
214
    } else {
215
        push @messages, { type => 'message', code => 'success_on_delete_category' };
215
        push @messages, { type => 'message', code => 'success_on_delete_category' };
216
    }
216
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-6 / +7 lines)
Lines 79-85 tinyMCE.init({ Link Here
79
    <div id="yui-main">
79
    <div id="yui-main">
80
    <div class="yui-b">
80
    <div class="yui-b">
81
81
82
[% FOR m IN messages %]
82
[% FOREACH m IN messages %]
83
    <div class="dialog [% m.type %]">
83
    <div class="dialog [% m.type %]">
84
        [% SWITCH m.code %]
84
        [% SWITCH m.code %]
85
        [% CASE 'error_on_update' %]
85
        [% CASE 'error_on_update' %]
Lines 387-399 tinyMCE.init({ Link Here
387
[% END %]
387
[% END %]
388
388
389
[% IF op == 'delete_confirm_category' %]
389
[% IF op == 'delete_confirm_category' %]
390
    <div class="dialog message">
390
    <div class="dialog alert">
391
    Are you sure you want to delete the group '[% category.codedescription %]' ([% category.categorycode %])?
391
    <h3>Are you sure you want to delete the group '[% category.codedescription %]' ([% category.categorycode %])?</h3>
392
    <form action="/cgi-bin/koha/admin/branches.pl" method="post">
392
    <form action="/cgi-bin/koha/admin/branches.pl" method="post">
393
        <input type="hidden" name="op" value="delete_confirmed_category" />
393
        <input type="hidden" name="op" value="delete_confirmed_category" />
394
        <input type="hidden" name="categorycode" value="[% category.categorycode |html %]" />
394
        <input type="hidden" name="categorycode" value="[% category.categorycode |html %]" />
395
        <input type="submit" value="Delete" />
395
        <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
396
        <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a>
396
    </form>
397
    <form action="/cgi-bin/koha/admin/branches.pl" method="get">
398
        <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
397
    </form>
399
    </form>
398
    </div>
400
    </div>
399
[% END %]
401
[% END %]
400
- 

Return to bug 16092