Bugzilla – Attachment 101578 Details for
Bug 15326
Add CMS feature
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15326: Fix filters and adjust tiny_mce assets
Bug-15326-Fix-filters-and-adjust-tinymce-assets.patch (text/plain), 9.16 KB, created by
Nick Clemens (kidclamp)
on 2020-03-24 13:40:24 UTC
(
hide
)
Description:
Bug 15326: Fix filters and adjust tiny_mce assets
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2020-03-24 13:40:24 UTC
Size:
9.16 KB
patch
obsolete
>From 9b782555345971946c2986c10f9070acee16c823 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Mon, 9 Dec 2019 12:06:49 +0000 >Subject: [PATCH] Bug 15326: Fix filters and adjust tiny_mce assets > >--- > .../prog/en/modules/tools/cmspages.tt | 40 ++++++++++------------ > 1 file changed, 18 insertions(+), 22 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt >index 2594ea15e7..8ed52c10db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt >@@ -8,7 +8,6 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Pages</title> > [% INCLUDE 'doc-head-close.inc' %] >-[% Asset.css("css/datatables.css") | $raw %] > </head> > <body id="tools_koha-content" class="tools"> > [% INCLUDE 'header.inc' %] >@@ -17,13 +16,13 @@ > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › > [% IF ( form ) %] >- <a href="[% link_self | uri %]">Pages</a> › >+ <a href="[% link_self | url %]">Pages</a> › > [% IF ( id ) %]Edit page[% ELSE %]Add page[% END %] > [% ELSIF ( view ) %] >- <a href="[% link_self | uri %]">Pages</a> › >+ <a href="[% link_self | url %]">Pages</a> › > [% IF ( cms_page.parent ) %] > [% FOREACH parent IN parent_list %] >- [% IF parent.id == cms_page.parent %]<a href="[% link_self | uri %]?op=view&id=[% cms_page.parent | uri %]">[% parent.title_link | uri %]</a> ›[% END %] >+ [% IF parent.id == cms_page.parent %]<a href="[% link_self | url %]?op=view&id=[% cms_page.parent | uri %]">[% parent.title_link | uri %]</a> ›[% END %] > [% END %] > [% END %] > [% cms_page.title_link | html %] >@@ -43,19 +42,16 @@ > [% END %] > <main> > >- [% UNLESS ( link_opac_base && link_self) %] >+ [% UNLESS ( link_opac_base ) %] > <div class="dialog alert"> > [% UNLESS ( link_opac_base ) %] > Warning: Preference <em>OPACBaseURL</em> not set, some links might not work!</div> > [% END %] >- [% UNLESS ( link_self ) %] >- Warning: Variable <em>link_self</em> not set, some links might not work!</div> >- [% END %] > [% END %] > > [% UNLESS ( form || view ) %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newentry" href="[% link_self | uri %]?op=form"><i class="fa fa-plus"></i> New page</a> >+ <a class="btn btn-default" id="newentry" href="[% link_self | url %]?op=form"><i class="fa fa-plus"></i> New page</a> > </div> > [% END %] > >@@ -84,7 +80,7 @@ > [% IF ( pages ) %] > <fieldset> > <ul> >- <li><a href="[% link_self | uri %]">Pages home</a></li> >+ <li><a href="[% link_self | url %]">Pages home</a></li> > </ul> > <h4>Pages</h4> > [% INCLUDE 'cms-pages-nav.inc' %] >@@ -93,7 +89,7 @@ > </div> > </div> > [% ELSIF ( form ) %] >- <form name="form" method="post" enctype="multipart/form-data" action="[% link_self | html%]" > >+ <form name="form" method="post" enctype="multipart/form-data" action="[% link_self | url %]" > > <input type="hidden" name="op" value="[% op | html%]" /> > <input type="hidden" name="id" value="[% id | html %]" /> > <fieldset class="rows"> >@@ -203,7 +199,7 @@ > </fieldset> > <fieldset class="action"> > <input class="button" type="submit" value="Save" /> >- <a class="cancel" href="[% link_self | uri %]">Cancel</a> >+ <a class="cancel" href="[% link_self | url %]">Cancel</a> > </fieldset> > </form> > >@@ -211,7 +207,7 @@ > > <h1>Pages</h1> > <div style="margin-bottom:5px;"> >- <form name="filter" method="post" action="[% link_self | uri %]"> >+ <form name="filter" method="post" action="[% link_self | url %]"> > <label for="disp">Display location:</label> > <select name="disp" id="disp"> > [% IF ( disp == "" ) %] >@@ -268,7 +264,7 @@ > </div> > > [% IF ( page_list.size ) %] >- <form name="del_form" method="post" action="[% link_self | uri %]"> >+ <form name="del_form" method="post" action="[% link_self | url %]"> > <p><a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a></p> > <table id="pages_table"> > <thead> >@@ -326,7 +322,7 @@ > [% END %] > </td> > <td>[% page.sortorder | html %]</td> >- <td><a href="[% link_self | uri %]?op=form&id=[% page.id | uri %]">[% page.title_link | html %]</a></td> >+ <td><a href="[% link_self | url %]?op=form&id=[% page.id | uri %]">[% page.title_link | html %]</a></td> > <td>[% page.title | html %]</td> > <td class="actions"> > <div class="btn-group"> >@@ -334,13 +330,13 @@ > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="opencmspageactions[% page.id | html %]"> >- <li><a href="[% link_self | uri %]?op=form&id=[% page.id | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> >- <li><a href="[% link_self | uri %]?op=delSingle&id=[% page.id | uri %]" class="del_single" data-isparent="[% page.isParent | html %]"><i class="fa fa-trash"></i> Delete</a></li> >+ <li><a href="[% link_self | url %]?op=form&id=[% page.id | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="[% link_self | url %]?op=delSingle&id=[% page.id | uri %]" class="del_single" data-isparent="[% page.isParent | html %]"><i class="fa fa-trash"></i> Delete</a></li> > [% IF ( page.location == "" ) %] >- <li><a href="[% link_self | uri %]?op=view&id=[% page.id | uri %]"><i class="fa fa-eye"></i> View</a></li> >+ <li><a href="[% link_self | url %]?op=view&id=[% page.id | uri %]"><i class="fa fa-eye"></i> View</a></li> > <li><a target="_blank" href="[% link_opac | uri %]?id=[% page.id | uri %]"><i class="fa fa-eye"></i> View in OPAC</a></li> > [% ELSIF ( page.location == "1" ) %] >- <li><a href="[% link_self | uri %]?op=view&id=[% page.id | uri %]"><i class="fa fa-eye"></i> View</a></li> >+ <li><a href="[% link_self | url %]?op=view&id=[% page.id | uri %]"><i class="fa fa-eye"></i> View</a></li> > [% ELSIF ( page.location == "2" ) %] > <li><a target="_blank" href="[% link_opac | uri %]?id=[% page.id | uri %]"><i class="fa fa-eye"></i> View in OPAC</a></li> > [% END %] >@@ -358,7 +354,7 @@ > </form> > [% ELSE %] > <div class="dialog message"> >- No pages exist. <a href="[% link_self | uri %]?op=form">Create a new page?</a> >+ No pages exist. <a href="[% link_self | url %]?op=form">Create a new page?</a> > </div> > [% END # IF page_list.size %] > [% END # IF view / form %] >@@ -378,7 +374,8 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("js/tools-menu.js") | $raw %] >- [% Asset.js("lib/tiny_mce/tiny_mce.js") | $raw %] >+ [% Asset.js("lib/tiny_mce/tinymce.min.js") | $raw %] >+ [% INCLUDE 'str/tinymce_i18n.inc' %] > <script> > $(document).ready(function() { > $("#pages_table").dataTable($.extend(true, {}, dataTablesDefaults, { >@@ -416,7 +413,6 @@ > }); > }); > >- tinyMCE.baseURL = "[% interface | html %]/lib/tiny_mce"; > tinyMCE.init({ > mode : "textareas", > theme : "advanced", >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15326
:
45621
|
58272
|
58607
|
58608
|
58609
|
58787
|
63904
|
63905
|
64241
|
64941
|
64942
|
66255
|
70866
|
70867
|
70868
|
70869
|
70870
|
70871
|
76387
|
76388
|
76389
|
76390
|
76391
|
76392
|
78232
|
78233
|
78234
|
78235
|
78236
|
78237
|
78238
|
78240
|
79269
|
83318
|
83319
|
83320
|
83321
|
83322
|
83323
|
83324
|
83325
|
83326
|
83404
|
83405
|
83406
|
83407
|
83408
|
83409
|
83410
|
83411
|
83412
|
84682
|
84683
|
84684
|
84685
|
84686
|
84687
|
84688
|
84689
|
84690
|
84691
|
87494
|
87495
|
87496
|
87497
|
87498
|
87499
|
87500
|
87501
|
87502
|
87503
|
87608
|
87609
|
87610
|
87617
|
96084
|
96085
|
96086
|
96087
|
96088
|
96089
|
96090
|
96091
|
96092
|
96093
|
96094
|
96095
|
96096
|
96097
|
96098
|
97237
|
101565
|
101566
|
101567
|
101568
|
101569
|
101570
|
101571
|
101572
|
101573
|
101574
|
101575
|
101576
|
101577
|
101578
|
101579
|
101580
|
128341
|
128342
|
128343
|
128344
|
128345
|
128346
|
128347
|
128348
|
128349
|
128350
|
128351
|
128352
|
128353
|
128354
|
128355
|
128356
|
128357
|
128585
|
128642
|
136432
|
136757
|
136768
|
138489
|
138493
|
139028
|
139029
|
139030
|
139031
|
139111
|
139123
|
139124
|
139125
|
139172
|
139173
|
139174