Mercurial Mercurial > repos > enano-1.1 / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
includes/clientside/tinymce/plugins/table/merge_cells.htm
author Dan
Mon, 16 Feb 2009 16:17:25 -0500
changeset 832 7152ca0a0ce9
parent 543 dffcbfbc4e59
child 1193 e3b94bd055dc
permissions -rw-r--r--
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message) - Pages are now stored with an extra metadata field called page_format which is "wikitext" or "xhtml" - New $flags parameter + RENDER_* constants added that control RenderMan::render() behavior - Several other changes: * Added a sprite API for Javascript and made editor use sprites when possible * Removed a number of config options from the default install schema, replaced with second parameter to getConfig() calls * MessageBox in editor mostly replaced with miniPrompt * A few bugfixes related to password changes (registration didn't even work) * Rewrote the bitfield compression algorithm used to serialize allowed MIME types * Fixed some typos in language files and strings * Fixed a Text_Wiki bug in Heading parser
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
335
67bd3121a12e Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents: 1
diff changeset 
     1
 
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
1
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
     2
 
<html xmlns="http://www.w3.org/1999/xhtml">
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
     3
 
<head>
335
67bd3121a12e Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents: 1
diff changeset 
     4
 
	<title>{#table_dlg.merge_cells_title}</title>
67bd3121a12e Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents: 1
diff changeset 
     5
 
	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
67bd3121a12e Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents: 1
diff changeset 
     6
 
	<script type="text/javascript" src="../../utils/mctabs.js"></script>
67bd3121a12e Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents: 1
diff changeset 
     7
 
	<script type="text/javascript" src="../../utils/validate.js"></script>
67bd3121a12e Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents: 1
diff changeset 
     8
 
	<script type="text/javascript" src="js/merge_cells.js"></script>
1
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
     9
 
	<base target="_self" />
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    10
 
</head>
335
67bd3121a12e Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents: 1
diff changeset 
    11
 
<body style="margin: 8px" style="display: none">
543
dffcbfbc4e59 Upgraded TinyMCE to version 3.0.8
Dan
parents: 335
diff changeset 
    12
 
<form onsubmit="mergeCells();return false;" action="#">
1
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    13
 
	<fieldset>
335
67bd3121a12e Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents: 1
diff changeset 
    14
 
		<legend>{#table_dlg.merge_cells_title}</legend>
1
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    15
 
		  <table border="0" cellpadding="0" cellspacing="3" width="100%">
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    16
 
			  <tr>
335
67bd3121a12e Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents: 1
diff changeset 
    17
 
				<td>{#table_dlg.cols}:</td>
543
dffcbfbc4e59 Upgraded TinyMCE to version 3.0.8
Dan
parents: 335
diff changeset 
    18
 
				<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>
1
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    19
 
			  </tr>
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    20
 
			  <tr>
335
67bd3121a12e Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents: 1
diff changeset 
    21
 
				<td>{#table_dlg.rows}:</td>
1
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    22
 
				<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    23
 
			  </tr>
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    24
 
		  </table>
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    25
 
	</fieldset>
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    26
 












fe660c52c48f
Adding /includes



dan@scribus.fuhry.local.fuhry.local


parents: 

diff
changeset




    27


	<div class="mceActionPanel">













fe660c52c48f
Adding /includes



dan@scribus.fuhry.local.fuhry.local


parents: 

diff
changeset




    28


		<div style="float: left">








543






dffcbfbc4e59
Upgraded TinyMCE to version 3.0.8



Dan


parents: 
335

diff
changeset




    29


			<input type="submit" id="insert" name="insert" value="{#update}" />








1






fe660c52c48f
Adding /includes



dan@scribus.fuhry.local.fuhry.local


parents: 

diff
changeset




    30


		</div>













fe660c52c48f
Adding /includes



dan@scribus.fuhry.local.fuhry.local


parents: 

diff
changeset




    31














fe660c52c48f
Adding /includes



dan@scribus.fuhry.local.fuhry.local


parents: 

diff
changeset




    32


		<div style="float: right">








335






67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.



Dan


parents: 
1

diff
changeset




    33


			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />








1






fe660c52c48f
Adding /includes



dan@scribus.fuhry.local.fuhry.local


parents: 

diff
changeset




    34


		</div>













fe660c52c48f
Adding /includes



dan@scribus.fuhry.local.fuhry.local


parents: 

diff
changeset




    35


	</div>













fe660c52c48f
Adding /includes



dan@scribus.fuhry.local.fuhry.local


parents: 

diff
changeset




    36


</form>













fe660c52c48f
Adding /includes



dan@scribus.fuhry.local.fuhry.local


parents: 

diff
changeset




    37


</body>













fe660c52c48f
Adding /includes



dan@scribus.fuhry.local.fuhry.local


parents: 

diff
changeset




    38


</html>















Enano CMS (1.1.x)