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
Sun, 04 May 2008 21:57:48 -0400
changeset 541 acb7e23b6ffa
parent 335 67bd3121a12e
child 543 dffcbfbc4e59
permissions -rw-r--r--
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
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">
1
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    12
 
<form onsubmit="insertTable();return false;" action="#">
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>
1
fe660c52c48f Adding /includes
dan@scribus.fuhry.local.fuhry.local
parents:
diff changeset 
    18
 
				<td align="right"><input type="text" name="numcols" value="" class="number min1" style="width: 30px" /></td>
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">








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




    29


			<input type="button" id="insert" name="insert" value="{#update}" onclick="mergeCells();" />








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)