annotate static/js/tiny_mce/plugins/table/merge_cells.htm @ 943:cf9918328c64
Haystack tweaks for Django 1.7.7.
I had to upgrade to Haystack 2.3.1 to get it to work with Django
1.7.7. I also had to update the Xapian backend. But I ran into
problems.
On my laptop anyway (Ubuntu 14.0.4), xapian gets mad when search terms
are greater than 245 chars (or something) when indexing. So I created
a custom field that would simply omit terms greater than 64 chars and
used this field everywhere I previously used a CharField.
Secondly, the custom search form was broken now. Something changed in
the Xapian backend and exact searches stopped working. Fortunately the
auto_query (which I was using originally and broke during an upgrade)
started working again. So I cut the search form back over to doing an
auto_query. I kept the form the same (3 fields) because I didn't want
to change the form and I think it's better that way.
| author |
Brian Neal <bgneal@gmail.com> |
| date |
Wed, 13 May 2015 20:25:07 -0500 |
| parents |
6c182ceb7147 |
| children |
|
| rev |
line source |
|
bgneal@312
|
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
|
bgneal@312
|
2 <html xmlns="http://www.w3.org/1999/xhtml">
|
|
bgneal@312
|
3 <head>
|
|
bgneal@312
|
4 <title>{#table_dlg.merge_cells_title}</title>
|
|
bgneal@312
|
5 <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
|
|
bgneal@312
|
6 <script type="text/javascript" src="../../utils/mctabs.js"></script>
|
|
bgneal@312
|
7 <script type="text/javascript" src="../../utils/validate.js"></script>
|
|
bgneal@312
|
8 <script type="text/javascript" src="js/merge_cells.js"></script>
|
|
bgneal@312
|
9 </head>
|
|
bgneal@442
|
10 <body style="margin: 8px" role="application">
|
|
bgneal@312
|
11 <form onsubmit="MergeCellsDialog.merge();return false;" action="#">
|
|
bgneal@312
|
12 <fieldset>
|
|
bgneal@312
|
13 <legend>{#table_dlg.merge_cells_title}</legend>
|
|
bgneal@442
|
14 <table role="presentation" border="0" cellpadding="0" cellspacing="3" width="100%">
|
|
bgneal@442
|
15 <tr>
|
|
bgneal@442
|
16 <td><label for="numcols">{#table_dlg.cols}</label>:</td>
|
|
bgneal@442
|
17 <td align="right"><input type="text" id="numcols" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" aria-required="true" /></td>
|
|
bgneal@442
|
18 </tr>
|
|
bgneal@442
|
19 <tr>
|
|
bgneal@442
|
20 <td><label for="numrows">{#table_dlg.rows}</label>:</td>
|
|
bgneal@442
|
21 <td align="right"><input type="text" id="numrows" name="numrows" value="" class="number min1" style="width: 30px" aria-required="true" /></td>
|
|
bgneal@442
|
22 </tr>
|
|
bgneal@442
|
23 </table>
|
|
bgneal@312
|
24 </fieldset>
|
|
bgneal@312
|
25
|
|
bgneal@312
|
26 <div class="mceActionPanel">
|
|
bgneal@312
|
27 <input type="submit" id="insert" name="insert" value="{#update}" />
|
|
bgneal@312
|
28 <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
|
|
bgneal@312
|
29 </div>
|
|
bgneal@312
|
30 </form>
|
|
bgneal@312
|
31 </body>
|
|
bgneal@312
|
32 </html>
|
