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

(-)a/help.pl (+15 lines)
Lines 21-26 use strict; Link Here
21
use warnings;
21
use warnings;
22
use C4::Templates;
22
use C4::Templates;
23
use C4::Output;
23
use C4::Output;
24
use C4::NewsChannels; # GetNewsToDisplay
24
# use C4::Auth;
25
# use C4::Auth;
25
use C4::Context;
26
use C4::Context;
26
use CGI qw ( -utf8 );
27
use CGI qw ( -utf8 );
Lines 61-70 unless ( -e "$htdocs/$theme/$lang/modules/$from" ) { Link Here
61
my $template = C4::Templates::gettemplate($from, 'intranet', $query);
62
my $template = C4::Templates::gettemplate($from, 'intranet', $query);
62
$template->param(
63
$template->param(
63
    referer => $refer,
64
    referer => $refer,
65
    helpkey => substr( $from, 0, rindex( $from, q{.} ) ),
64
    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
66
    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
65
    intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
67
    intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
66
);
68
);
67
69
70
# Prepare help from news...
71
my $homebranch;
72
if (C4::Context->userenv) {
73
    $homebranch = C4::Context->userenv->{'branch'};
74
}
75
my $help_from_news   = &GetNewsToDisplay('staffhelp', $homebranch);
76
my $help_from_news_count = scalar @$help_from_news;
77
$template->param(
78
    help_from_news       => $help_from_news,
79
    help_from_news_count => $help_from_news_count,
80
    homebranch           => $homebranch
81
);
82
68
my $help_version = C4::Context->preference("Version");
83
my $help_version = C4::Context->preference("Version");
69
if ( $help_version =~ m|^(\d+)\.(\d{2}).*$| ) {
84
if ( $help_version =~ m|^(\d+)\.(\d{2}).*$| ) {
70
    my $version = $1;
85
    my $version = $1;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/help-bottom.inc (+1 lines)
Lines 6-10 Link Here
6
        <input type="submit" class="submit" value="Edit help" /></fieldset>
6
        <input type="submit" class="submit" value="Edit help" /></fieldset>
7
    [% END %]
7
    [% END %]
8
</form>
8
</form>
9
</div> <!-- /koha-help -->
9
</body>
10
</body>
10
</html>
11
</html>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc (-16 / +34 lines)
Lines 1-21 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE Branches %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Online help</title>
4
<title>Online help</title>
4
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
6
<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css" />
7
<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" />
8
[% INCLUDE intranetstylesheet.inc %]
9
[% IF ( bidi ) %]
10
   <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" />
11
[% END %]
12
<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script>
13
<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
14
<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js"></script>
15
<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script>
16
<!-- koha core js -->
17
<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script>
18
19
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help.css" />
5
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help.css" />
20
</head>
6
[% INCLUDE 'doc-head-close.inc' %]
7
21
<body id="help" class="help">
8
<body id="help" class="help">
9
10
<div id="help-from-news">
11
    <h1><span class="help_title">Help for [% Branches.GetName( homebranch ) %]</span></h1>
12
        [% FOREACH helpitem IN help_from_news %]
13
        [% IF (helpitem.helpkey == helpkey) || (helpitem.helpkey == 'all') %]
14
            <div class="help-item-title" id="helpnews[% helpitem.idnew %]">
15
                <h4>[% helpitem.title %] [% helpitem.helpkey %]</h4>
16
                <div class="help-item-body">[% helpitem.content %]</div>
17
                <div class="help-item-date">[% helpitem.newdate %]</div>
18
                <div class="help-item-footer">
19
                    [% IF ( 1 || CAN_edit_help ) %]
20
                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% helpitem.idnew %]">
21
                        <i class="fa fa-pencil"></i>Edit</a>
22
                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% helpitem.idnew %]">
23
                        <i class="fa fa-trash"></i>Delete</a>
24
                    [% END %]
25
                </div>
26
            </div>
27
        [% END %]
28
    [% END %]
29
    <div class="help-item-buttons">
30
        <p><a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;helpkey=[% helpkey %]&amp;lang=staffhelp">
31
        <i class="fa fa-pencil"></i>New custom help for this page</a>
32
        <span class="hint">Key is: [% helpkey %]</span></p>
33
        <p><a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;helpkey=all&amp;lang=staffhelp">
34
        <i class="fa fa-plus"></i>New custom help for all pages</a>
35
        <span class="hint">Key is: all</span></p>
36
    </div>
37
</div><!-- /help-from-news -->
38
39
<div id="koha-help">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt (+23 lines)
Lines 119-124 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here
119
                [% ELSE %]
119
                [% ELSE %]
120
                <option value="slip"                    >Slip</option>
120
                <option value="slip"                    >Slip</option>
121
                [% END %]
121
                [% END %]
122
                [% IF ( default_lang == "staffhelp" ) %]
123
                    <option value="staffhelp" selected="selected">Staff help</option>
124
                [% ELSE %]
125
                    <option value="staffhelp">Staffhelp</option>
126
                [% END %]
122
                [% FOREACH lang_lis IN lang_list %]
127
                [% FOREACH lang_lis IN lang_list %]
123
                [% IF ( lang_lis.language == default_lang ) %]
128
                [% IF ( lang_lis.language == default_lang ) %]
124
                    <option value="[% lang_lis.language %]" selected="selected">OPAC ([% lang_lis.language %])</option>
129
                    <option value="[% lang_lis.language %]" selected="selected">OPAC ([% lang_lis.language %])</option>
Lines 161-166 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here
161
                    <input id="number" size="3" name="number" type="text" />
166
                    <input id="number" size="3" name="number" type="text" />
162
                [% END %]
167
                [% END %]
163
            </li>
168
            </li>
169
            <li>
170
                <label for="helpkey">Help key: </label>
171
                [% IF ( new_detail.helpkey ) %]
172
                    <input id="number" size="60" name="helpkey" type="text" value="[% new_detail.helpkey %]" />
173
                [% ELSIF ( helpkey ) %]
174
                    <input id="number" size="60" name="helpkey" type="text" value="[% helpkey %]" />
175
                [% ELSE %]
176
                    <input id="helpkey" size="60" name="helpkey" type="text" />
177
                [% END %]
178
                <span class="hint">Used for news driven custom help system</span>
179
            </li>
164
            <li><label for="content">News: </label>
180
            <li><label for="content">News: </label>
165
            <textarea name="content" id="content"  cols="75" rows="10">[% new_detail.content %]</textarea>
181
            <textarea name="content" id="content"  cols="75" rows="10">[% new_detail.content %]</textarea>
166
            </li>
182
            </li>
Lines 189-194 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here
189
            [% ELSE %]
205
            [% ELSE %]
190
            <option value="slip"         >Slip</option>
206
            <option value="slip"         >Slip</option>
191
            [% END %]
207
            [% END %]
208
            [% IF ( lang == "staffhelp" ) %]
209
            <option value="staffhelp" selected="selected">Staff help</option>
210
            [% ELSE %]
211
            <option value="staffhelp"         >Staff help</option>
212
            [% END %]
192
                [% FOREACH lang_lis IN lang_list %]
213
                [% FOREACH lang_lis IN lang_list %]
193
                [% IF ( lang_lis.language == lang ) %]
214
                [% IF ( lang_lis.language == lang ) %]
194
                    <option value="[% lang_lis.language %]" selected="selected">OPAC ([% lang_lis.language %])</option>
215
                    <option value="[% lang_lis.language %]" selected="selected">OPAC ([% lang_lis.language %])</option>
Lines 240-245 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here
240
                                    Slip
261
                                    Slip
241
                                [%   CASE "" %]
262
                                [%   CASE "" %]
242
                                    All
263
                                    All
264
                                [% CASE "staffhelp" %]
265
                                    Staff help <span class="hint">[% opac_new.helpkey %]</span>
243
                                [%   CASE %]
266
                                [%   CASE %]
244
                                    OPAC ([% opac_new.lang %])
267
                                    OPAC ([% opac_new.lang %])
245
                                [% END %]
268
                                [% END %]
(-)a/tools/koha-news.pl (-3 / +12 lines)
Lines 45-50 if ( $cgi->param('expirationdate') ) { Link Here
45
}
45
}
46
my $timestamp      = output_pref({ dt => dt_from_string( scalar $cgi->param('timestamp') ), dateformat => 'iso', dateonly => 1 });
46
my $timestamp      = output_pref({ dt => dt_from_string( scalar $cgi->param('timestamp') ), dateformat => 'iso', dateonly => 1 });
47
my $number         = $cgi->param('number');
47
my $number         = $cgi->param('number');
48
my $helpkey        = $cgi->param('helpkey');
48
my $lang           = $cgi->param('lang');
49
my $lang           = $cgi->param('lang');
49
my $branchcode     = $cgi->param('branch');
50
my $branchcode     = $cgi->param('branch');
50
my $error_message  = $cgi->param('error_message');
51
my $error_message  = $cgi->param('error_message');
Lines 99-109 if ( $op eq 'add_form' ) { Link Here
99
        $template->{VARS}->{'new_detail'} = $new_detail;
100
        $template->{VARS}->{'new_detail'} = $new_detail;
100
    }
101
    }
101
    else {
102
    else {
102
        $template->param( op => 'add' );
103
        $template->param(
104
            op => 'add',
105
            helpkey => $helpkey
106
        );
107
103
    }
108
    }
104
}
109
}
105
elsif ( $op eq 'add' ) {
110
elsif ( $op eq 'add' ) {
111
warn "OPACADD";
106
    if ($title) {
112
    if ($title) {
113
warn "IN TITLE";
114
warn $helpkey;
107
        add_opac_new(
115
        add_opac_new(
108
            {
116
            {
109
                title          => $title,
117
                title          => $title,
Lines 112-117 elsif ( $op eq 'add' ) { Link Here
112
                expirationdate => $expirationdate,
120
                expirationdate => $expirationdate,
113
                timestamp      => $timestamp,
121
                timestamp      => $timestamp,
114
                number         => $number,
122
                number         => $number,
123
                helpkey        => $helpkey,
115
                branchcode     => $branchcode,
124
                branchcode     => $branchcode,
116
                borrowernumber => $borrowernumber,
125
                borrowernumber => $borrowernumber,
117
            }
126
            }
Lines 131-136 elsif ( $op eq 'edit' ) { Link Here
131
            lang           => $lang,
140
            lang           => $lang,
132
            expirationdate => $expirationdate,
141
            expirationdate => $expirationdate,
133
            timestamp      => $timestamp,
142
            timestamp      => $timestamp,
143
            helpkey        => $helpkey,
134
            number         => $number,
144
            number         => $number,
135
            branchcode     => $branchcode,
145
            branchcode     => $branchcode,
136
        }
146
        }
Lines 145-151 elsif ( $op eq 'del' ) { Link Here
145
155
146
else {
156
else {
147
157
148
    my ( $opac_news_count, $opac_news ) = &get_opac_news( undef, $lang, $branchcode );
158
    my ( $opac_news_count, $opac_news ) = &get_opac_news( undef, 'staffhelp', $branchcode );
149
    
159
    
150
    foreach my $new ( @$opac_news ) {
160
    foreach my $new ( @$opac_news ) {
151
        next unless $new->{'expirationdate'};
161
        next unless $new->{'expirationdate'};
152
- 

Return to bug 18483