Mercurial > public > sg101
annotate media/js/tiny_mce/plugins/table/merge_cells.htm @ 197:2baadae33f2e
Got autocomplete working for the member search. Updated django and ran into a bug where url tags with comma separated kwargs starting consuming tons of CPU throughput. The work-around is to cut over to using spaces between arguments. This is now allowed to be consistent with other tags. Did some query optimization for the news app.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Sat, 10 Apr 2010 04:32:24 +0000 |
| parents | 149c3567fec1 |
| children |
| rev | line source |
|---|---|
| bgneal@45 | 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> |
| bgneal@45 | 2 <html xmlns="http://www.w3.org/1999/xhtml"> |
| bgneal@45 | 3 <head> |
| bgneal@45 | 4 <title>{#table_dlg.merge_cells_title}</title> |
| bgneal@45 | 5 <script type="text/javascript" src="../../tiny_mce_popup.js"></script> |
| bgneal@45 | 6 <script type="text/javascript" src="../../utils/mctabs.js"></script> |
| bgneal@45 | 7 <script type="text/javascript" src="../../utils/validate.js"></script> |
| bgneal@45 | 8 <script type="text/javascript" src="js/merge_cells.js"></script> |
| bgneal@45 | 9 </head> |
| bgneal@45 | 10 <body style="margin: 8px"> |
| bgneal@183 | 11 <form onsubmit="MergeCellsDialog.merge();return false;" action="#"> |
| bgneal@45 | 12 <fieldset> |
| bgneal@45 | 13 <legend>{#table_dlg.merge_cells_title}</legend> |
| bgneal@45 | 14 <table border="0" cellpadding="0" cellspacing="3" width="100%"> |
| bgneal@45 | 15 <tr> |
| bgneal@45 | 16 <td>{#table_dlg.cols}:</td> |
| bgneal@45 | 17 <td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td> |
| bgneal@45 | 18 </tr> |
| bgneal@45 | 19 <tr> |
| bgneal@45 | 20 <td>{#table_dlg.rows}:</td> |
| bgneal@45 | 21 <td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td> |
| bgneal@45 | 22 </tr> |
| bgneal@45 | 23 </table> |
| bgneal@45 | 24 </fieldset> |
| bgneal@45 | 25 |
| bgneal@45 | 26 <div class="mceActionPanel"> |
| bgneal@183 | 27 <input type="submit" id="insert" name="insert" value="{#update}" /> |
| bgneal@183 | 28 <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" /> |
| bgneal@45 | 29 </div> |
| bgneal@45 | 30 </form> |
| bgneal@45 | 31 </body> |
| bgneal@45 | 32 </html> |