gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster

This commit is contained in:
Chris Cormack 2011-09-15 08:42:56 +12:00
parent caae541135 7cc412d337
commit 6499cfc2c0
6 changed files with 105 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C4/Form/MessagingPreferences.pm
View File

@ -140,9 +140,9 @@ sub set_form_values {
} ( 0..30 ); # FIXME: 30 is a magic number.
}
foreach my $transport ( @{$pref->{'transports'}} ) {
$option->{'transport_'.$transport} = 'checked="checked"';
$option->{'transports_'.$transport} = 1;
}
$option->{'digest'} = 'checked="checked"' if $pref->{'wants_digest'};
$option->{'digest'} = 1 if $pref->{'wants_digest'};
}
$template->param(messaging_preferences => $messaging_options);
}

2
cataloguing/addbiblio.pl
View File

@ -874,7 +874,7 @@ foreach my $thisframeworkcode ( keys %$frameworks ) {
frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
);
if ($frameworkcode eq $thisframeworkcode){
$row{'selected'}="selected=\"selected\"";
$row{'selected'} = 1;
}
push @frameworkcodeloop, \%row;
}

2
koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
View File

@ -1,4 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html lang="[% lang %]" xml:lang="[% lang %]" [% IF ( bidi ) %]dir="[% bidi %]"[% END %] xmlns="http://www.w3.org/1999/xhtml">
[% IF ( bidi ) %]<html lang="[% lang %]" xml:lang="[% lang %]" dir="[% bidi %]" xmlns="http://www.w3.org/1999/xhtml">[% ELSE %]<html lang="[% lang %]" xml:lang="[% lang %]" xmlns="http://www.w3.org/1999/xhtml">[% END %]
<head>

72
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
View File

@ -54,15 +54,29 @@
[% IF ( messaging_preference.transport_sms ) %]
[% IF ( SMSSendDriver ) %]<td>
[% IF ( messaging_form_inactive ) %]
[% IF ( messaging_preference.transports_sms ) %]
<input type="checkbox"
id="sms[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="sms" [% messaging_preference.transport_sms %] disabled="disabled" />
value="sms" checked="checked" disabled="disabled" />
[% ELSE %]
<input type="checkbox"
id="sms[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="sms" disabled="disabled" />
[% END %]
[% ELSE %]
[% IF ( messaging_preference.transports_sms ) %]
<input type="checkbox"
id="sms[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="sms" [% messaging_preference.transport_sms %] onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
value="sms" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
[% ELSE %]
<input type="checkbox"
id="sms[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="sms" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
[% END %]
[% END %]
</td>[% END %]
[% ELSE %]
@ -72,15 +86,29 @@
[% IF ( messaging_preference.transport_email ) %]
<td>
[% IF ( messaging_form_inactive ) %]
<input type="checkbox"
id="email[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="email" [% messaging_preference.transport_email %] disabled="disabled" />
[% IF ( messaging_preference.transports_email ) %]
<input type="checkbox"
id="email[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="email" checked="checked" disabled="disabled" />
[% ELSE %]
<input type="checkbox"
id="email[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="email" disabled="disabled" />
[% END %]
[% ELSE %]
[% IF ( messaging_preference.transports_email ) %]
<input type="checkbox"
id="email[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="email" [% messaging_preference.transport_email %] onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
value="email" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
[% ELSE %]
<input type="checkbox"
id="email[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="email" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
[% END %]
[% END %]
</td>
[% ELSE %]
@ -90,15 +118,29 @@
[% IF ( messaging_preference.has_digest ) %]
<td>
[% IF ( messaging_form_inactive ) %]
<input type="checkbox"
id="digest[% messaging_preference.message_attribute_id %]"
value="[% messaging_preference.message_attribute_id %]"
name="digest" [% messaging_preference.digest %] disabled="disabled" />
[% IF ( messaging_preference.digest ) %]
<input type="checkbox"
id="digest[% messaging_preference.message_attribute_id %]"
value="[% messaging_preference.message_attribute_id %]"
name="digest" checked="checked" disabled="disabled" />
[% ELSE %]
<input type="checkbox"
id="digest[% messaging_preference.message_attribute_id %]"
value="[% messaging_preference.message_attribute_id %]"
name="digest" disabled="disabled" />
[% END %]
[% ELSE %]
<input type="checkbox"
id="digest[% messaging_preference.message_attribute_id %]"
value="[% messaging_preference.message_attribute_id %]"
name="digest" [% messaging_preference.digest %] onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
[% IF ( messaging_preference.digest ) %]
<input type="checkbox"
id="digest[% messaging_preference.message_attribute_id %]"
value="[% messaging_preference.message_attribute_id %]"
name="digest" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
[% ELSE %]
<input type="checkbox"
id="digest[% messaging_preference.message_attribute_id %]"
value="[% messaging_preference.message_attribute_id %]"
name="digest" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
[% END %]
[% END %]
</td>
[% ELSE %]

8
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
View File

@ -778,8 +778,12 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
<li id="changeframework"><label for="Frameworks">Change framework: </label>
<select name="Frameworks" id="Frameworks" onchange="Changefwk(this);">
<option value="Default">Default</option>
[% FOREACH frameworkcodeloo IN frameworkcodeloop %]
<option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
[% FOREACH frameworkcodeloo IN frameworkcodeloop %]
[% IF ( frameworkcodeloo.selected ) %]
<option value="[% frameworkcodeloo.value %]" selected="selected">
[% ELSE %]
<option value="[% frameworkcodeloo.value %]">
[% END %]
[% frameworkcodeloo.frameworktext %]
</option>
[% END %]

49
koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
View File

@ -59,29 +59,56 @@
<td>-</td>
[% END %]
[% IF ( messaging_preference.transport_sms ) %]
[% IF ( SMSSendDriver ) %]<td><input type="checkbox"
id="sms[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="sms" [% messaging_preference.transport_sms %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /></td>[% END %]
[% IF ( SMSSendDriver ) %]
<td>
[% IF ( messaging_preference.transports_sms ) %]
<input type="checkbox"
id="sms[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="sms" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
[% ELSE %]
<input type="checkbox"
id="sms[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="sms" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
[% END %]
</td>
[% END %]
[% ELSE %]
<td>-</td>
<td>-</td>
[% END %]
[% IF ( messaging_preference.transport_email ) %]
<td><input type="checkbox"
id="email[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="email" [% messaging_preference.transport_email %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
<td>
[% IF ( messaging_preference.transports_email ) %]
<input type="checkbox"
id="email[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
[% ELSE %]
<input type="checkbox"
id="email[% messaging_preference.message_attribute_id %]"
name="[% messaging_preference.message_attribute_id %]"
value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
[% END %]
</td>
[% ELSE %]
<td>-</td>
[% END %]
[% IF ( messaging_preference.has_digest ) %]
<td><input type="checkbox"
<td>
[% IF ( messaging_preference.digest ) %]
<input type="checkbox"
id="digest[% messaging_preference.message_attribute_id %]"
value="[% messaging_preference.message_attribute_id %]"
name="digest" [% messaging_preference.digest %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
name="digest" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
[% ELSE %]
<input type="checkbox"
id="digest[% messaging_preference.message_attribute_id %]"
value="[% messaging_preference.message_attribute_id %]"
name="digest" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
[% END %]
</td>
[% ELSE %]
<td>-</td>