Mercurial Mercurial > py_tasks_melange / 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.
app/tiny_mce/plugins/table/merge_cells.htm
author Lennard de Rijk <ljvderijk@gmail.com>
Thu, 13 Aug 2009 14:02:22 -0700
changeset 2770 71a5a56cf29e
parent 154 d2377425d3f2
permissions -rwxr-xr-x
Redone the acceptedStudentsExport functionality. The method has been renamed to exportStudentsWithProjects and retrieves the document_name and the new shipping address properties. Also it filters out all invalid projects or projects for wich the scope_path doesn't match the given scope_pa th_start. Also there is no more need to use the argument given to this method when adding the extra columns. The data is now prepared by one loop which uses the key present in the accepted_students dictionary for retrieving the data used by the extra columns.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
126
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     1
 
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     2
 
<html xmlns="http://www.w3.org/1999/xhtml">
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     3
 
<head>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     4
 
	<title>{#table_dlg.merge_cells_title}</title>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     5
 
	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     6
 
	<script type="text/javascript" src="../../utils/mctabs.js"></script>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     7
 
	<script type="text/javascript" src="../../utils/validate.js"></script>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     8
 
	<script type="text/javascript" src="js/merge_cells.js"></script>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     9
 
	<base target="_self" />
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    10
 
</head>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    11
 
<body style="margin: 8px" style="display: none">
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    12
 
<form onsubmit="mergeCells();return false;" action="#">
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    13
 
	<fieldset>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    14
 
		<legend>{#table_dlg.merge_cells_title}</legend>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    15
 
		  <table border="0" cellpadding="0" cellspacing="3" width="100%">
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    16
 
			  <tr>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    17
 
				<td>{#table_dlg.cols}:</td>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    18
 
				<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    19
 
			  </tr>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    20
 
			  <tr>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    21
 
				<td>{#table_dlg.rows}:</td>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    22
 
				<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    23
 
			  </tr>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    24
 
		  </table>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    25
 
	</fieldset>
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
    26
 












6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    27


	<div class="mceActionPanel">













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    28


		<div style="float: left">













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    29


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













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    30


		</div>













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    31














6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    32


		<div style="float: right">













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    33


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













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    34


		</div>













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    35


	</div>













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    36


</form>













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    37


</body>













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    38


</html>















py_tasks_melange