source: trunk/modules/InsertTable/insert_table.html @ 694

Last change on this file since 694 was 694, checked in by gogo, 13 years ago

Merge from branches/688-fixup to complete the fix of changeset:688 to
have history. See ticket:10 for info.

For reference, this is how I fixed it...

  1. Checkout
  2. Rolled back the bad revision (svn merge -c -688) in the WC
  3. Copied that WC to a branch to work on (branches/688-fixup)
  4. Checkout copy of the branch
  5. In branch, use svn mv and svn cp to shift the files properly
  6. Checkout a copy of the trunk
  7. Apply any remaining differences from the trunk to the branch (manually, just copy the files across)
  8. Checkin the branch
  9. Checkout 2nd copy of trunk as merge_WC
  10. svn merge trunk_WC@688 branch_WC@HEAD merge_WC
  11. Verify that there are no differences in the files between the

three working copies (the only difference now should be history)

  1. checkin the merge_WC (this commit)

As you can see, it's a complete pain to fixup these, so please everybody
be careful to use the correct subversion commands when you move (rename)
and copy files.

  • Property svn:eol-style set to native
  • Property svn:keywords set to LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
File size: 4.6 KB
Line 
1<html>
2
3<head>
4  <title>Insert Table</title>
5
6<script type="text/javascript" src="../../popups/popup.js"></script>
7<link rel="stylesheet" type="text/css" href="../../popups/popup.css" />
8
9<script type="text/javascript">
10
11window.resizeTo(425, 250);
12
13Xinha = window.opener.Xinha;
14function i18n(str) {
15  return (Xinha._lc(str, 'Xinha'));
16}
17
18function Init() {
19  Xinha = window.opener.Xinha; // load the Xinha plugin and lang file
20  __dlg_translate('Xinha');
21  __dlg_init(null, Xinha.is_ie ? null : {width:425,height:250});
22  // Make sure the translated string appears in the drop down. (for gecko)
23  document.getElementById("f_unit").selectedIndex = 1;
24  document.getElementById("f_unit").selectedIndex = 0;
25  document.getElementById("f_align").selectedIndex = 1;
26  document.getElementById("f_align").selectedIndex = 0;
27  document.getElementById("f_rows").focus();
28}
29
30function onOK() {
31  var required = {
32    "f_rows": i18n("You must enter a number of rows"),
33    "f_cols": i18n("You must enter a number of columns")
34  };
35  for (var i in required) {
36    var el = document.getElementById(i);
37    if (!el.value) {
38      alert(required[i]);
39      el.focus();
40      return false;
41    }
42  }
43  var fields = ["f_rows", "f_cols", "f_width", "f_unit", "f_fixed",
44                "f_align", "f_border", "f_spacing", "f_padding"];
45  var param = new Object();
46  for (var i in fields) {
47    var id = fields[i];
48    var el = document.getElementById(id);
49    param[id] = (el.type == "checkbox") ? el.checked : el.value;
50  }
51  __dlg_close(param);
52  return false;
53}
54
55function onCancel() {
56  __dlg_close(null);
57  return false;
58}
59
60</script>
61
62</head>
63
64<body class="dialog" onload="Init()">
65
66<div class="title">Insert Table</div>
67
68<form action="" method="get">
69<table border="0" style="padding: 0px; margin: 0px">
70  <tbody>
71
72  <tr>
73    <td style="width: 4em; text-align: right">Rows:</td>
74    <td><input type="text" name="rows" id="f_rows" size="5" title="Number of rows" value="2" /></td>
75    <td style="width: 4em; text-align: right">Width:</td>
76    <td><input type="text" name="width" id="f_width" size="5" title="Width of the table" value="100" /></td>
77    <td><select size="1" name="unit" id="f_unit" title="Width unit">
78      <option value="%" selected="1"  >Percent</option>
79      <option value="px"              >Pixels</option>
80      <option value="em"              >Em</option>
81    </select></td>
82  </tr>
83  <tr>
84    <td style="width: 4em; text-align: right">Cols:</td>
85    <td><input type="text" name="cols" id="f_cols" size="5" title="Number of columns" value="4" /></td>
86    <td style="text-align: right"><input type="checkbox" checked="checked" name="fixed" id="f_fixed" /></td>
87    <td colspan="2"><label for="f_fixed"
88    >Fixed width columns</label></td>
89  </tr>
90  </tbody>
91</table>
92
93<p />
94
95<fieldset style="float: left; margin-left: 5px;">
96<legend>Layout</legend>
97
98<div class="space"></div>
99
100<div class="fl">Alignment:</div>
101<select size="1" name="align" id="f_align"
102  title="Positioning of this table">
103  <option value="" selected="1"                >Not set</option>
104  <option value="left"                         >Left</option>
105  <option value="right"                        >Right</option>
106  <option value="texttop"                      >Texttop</option>
107  <option value="absmiddle"                    >Absmiddle</option>
108  <option value="baseline"                     >Baseline</option>
109  <option value="absbottom"                    >Absbottom</option>
110  <option value="bottom"                       >Bottom</option>
111  <option value="middle"                       >Middle</option>
112  <option value="top"                          >Top</option>
113</select>
114
115<p />
116
117<div class="fl">Border thickness:</div>
118<input type="text" name="border" id="f_border" size="5" value="1"
119title="Leave empty for no border" />
120<!--
121<p />
122
123<div class="fl">Collapse borders:</div>
124<input type="checkbox" name="collapse" id="f_collapse" />
125-->
126<div class="space"></div>
127
128</fieldset>
129
130<fieldset style="float:right; margin-right: 5px;">
131<legend>Spacing</legend>
132
133<div class="space"></div>
134
135<div class="fr">Cell spacing:</div>
136<input type="text" name="spacing" id="f_spacing" size="5" value="1"
137title="Space between adjacent cells" />
138
139<p />
140
141<div class="fr">Cell padding:</div>
142<input type="text" name="padding" id="f_padding" size="5" value="1"
143title="Space between content and border in cell" />
144
145<div class="space"></div>
146
147</fieldset>
148
149<div style="margin-top: 85px; border-top: 1px solid #999; padding: 2px; text-align: right;">
150<button type="button" name="ok" onclick="return onOK();">OK</button>
151<button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
152</div>
153
154</form>
155
156</body>
157</html>
Note: See TracBrowser for help on using the repository browser.