瀏覽代碼

review style and alignment for cdb column form

Nicolas Cannasse 6 年之前
父節點
當前提交
8ba78fc898
共有 3 個文件被更改,包括 79 次插入66 次删除
  1. 11 8
      bin/cdb.css
  2. 10 7
      bin/cdb.less
  3. 58 51
      hide/comp/cdb/ModalColumnForm.hx

+ 11 - 8
bin/cdb.css

@@ -316,31 +316,34 @@
 .cdb .content-modal form select {
   height: 28px;
 }
+.cdb .content-modal form td.first {
+  width: 120px;
+}
 .cdb .content-modal form .t_int .disp,
 .cdb .content-modal form .t_float .disp {
-  display: block;
+  display: table-row;
 }
-.cdb .content-modal form .t_string .localizable {
-  display: block;
+.cdb .content-modal form .t_string .kind {
+  display: table-row;
 }
 .cdb .content-modal form .t_enum .values,
 .cdb .content-modal form .t_flags .values {
-  display: block;
+  display: table-row;
 }
 .cdb .content-modal form .t_ref .sheet {
-  display: block;
+  display: table-row;
 }
 .cdb .content-modal form .t_layer .sheet {
-  display: block;
+  display: table-row;
 }
 .cdb .content-modal form .t_custom .custom {
-  display: block;
+  display: table-row;
 }
 .cdb .content-modal form .values,
 .cdb .content-modal form .sheet,
 .cdb .content-modal form .custom,
 .cdb .content-modal form .disp,
-.cdb .content-modal form .localizable {
+.cdb .content-modal form .kind {
   display: none;
 }
 .cdb .content-modal form.edit input.create {

+ 10 - 7
bin/cdb.less

@@ -355,17 +355,20 @@
 			input[type=text], input[type=submit], select {
 				height: 28px;
 			}
+			td.first {
+				width : 120px;
+			}
 			.t_int, .t_float {
-				.disp { display : block; }
+				.disp { display : table-row; }
 			}
 			.t_string {
-				.localizable { display : block; }
+				.kind { display : table-row; }
 			}
-			.t_enum .values, .t_flags .values { display : block; }
-			.t_ref .sheet { display : block; }
-			.t_layer .sheet { display : block; }
-			.t_custom .custom { display : block; }
-			.values, .sheet, .custom, .disp, .localizable  { display : none; }
+			.t_enum .values, .t_flags .values { display : table-row; }
+			.t_ref .sheet { display : table-row; }
+			.t_layer .sheet { display : table-row; }
+			.t_custom .custom { display : table-row; }
+			.values, .sheet, .custom, .disp, .kind { display : none; }
 
 		}
 

+ 58 - 51
hide/comp/cdb/ModalColumnForm.hx

@@ -22,11 +22,16 @@ class ModalColumnForm extends Modal {
 
 		form = new Element('<form id="col_form" onsubmit="return false">
 
-			<div>Column name</div> <input type="text" name="name"/>
-			<br /><br />
+			<table>
+				<tr>
+				<td class="first">Column name
+				<td><input type="text" name="name"/>
+				</tr>
 
-			<div>Column type</div>
-			<select name="type" onchange="$(\'#col_options\').attr(\'class\',\'t_\'+this.value)">
+				<tr>
+				<td>Column type
+				<td>
+				<select name="type">
 				<option value="">---- Choose -----</option>
 				<option value="id">Unique Identifier</option>
 				<option value="string">Text</option>
@@ -46,57 +51,58 @@ class ModalColumnForm extends Modal {
 				<option value="layer">Data Layer</option>
 				<option value="tilelayer">Tile Layer</option>
 				<option value="custom">Custom Type</option>
-			</select>
-			<br /><br />
-
-			<div id="col_options">
-				<div class="values">
-					Possible Values
-					<br />
-					<input type="text" name="values" name="vals"/>
-					<br /><br />
-				</div>
-
-				<div class="sheet">
-					Sheet
-					<br />
-					<select name="sheet"></select>
-					<br /><br />
-				</div>
-
-				<div class="disp">
-					Display
-					<br />
+				</select>
+				</tr>
+
+				<tr class="values">
+				<td>Possible Values
+				<td><input type="text" name="values" name="vals"/>
+				</tr>
+
+				<tr class="sheet">
+				<td>Sheet
+				<td><select name="sheet"></select>
+				</tr>
+
+				<tr class="disp">
+				<td>Display
+				<td>
 					<select name="display">
 					<option value="0">Default</option>
 					<option value="1">Percentage</option>
 					</select>
-					<br /><br />
-				</div>
+				</tr>
 
-				<div class="kind">
-					Kind
-					<br/>
+				<tr class="kind">
+					<td>Kind
+					<td>
 					<select name="kind">
 					<option value="">Default</option>
 					<option value="localizable">Localizable</option>
 					<option value="script">Script</option>
 					</select>
-				</div>
-
-				<div class="custom">
-					Type
-					<select name="ctype"></select>
-					<br /><br />
-				</div>
-				<div class="opt"><label><input type="checkbox" name="req"/>&nbsp;Required</label></div>
-			</div>
-			<br /><br />
-			<p class="buttons">
-				<input class="edit" type="submit" value="Modify" id="editBtn" />
-				<input class="create" type="submit" value="Create" id="createBtn" />
-				<input type="submit" value="Cancel" id="cancelBtn" />
-			</p>
+				</tr>
+
+				<tr class="custom">
+					<td>Type
+					<td><select name="ctype"></select>
+				</tr>
+
+				<tr class="opt">
+					<td>&nbsp;
+					<td><label><input type="checkbox" name="req"/>&nbsp;Required</label>
+				</tr>
+
+				<tr>
+					<td>&nbsp;
+					<td>
+						<p class="buttons">
+							<input class="edit" type="submit" value="Modify" id="editBtn" />
+							<input class="create" type="submit" value="Create" id="createBtn" />
+							<input type="submit" value="Cancel" id="cancelBtn" />
+						</p>
+				</tr>
+			</table>
 
 			</form>').appendTo(contentModal);
 
@@ -108,12 +114,13 @@ class ModalColumnForm extends Modal {
 			new Element("<option>").attr("value", "" + i).text(s.name).appendTo(sheets);
 		}
 
-		var types = form.find("[name=ctype]");
-		types.empty();
-		types.off("change");
-		types.change(function(_) {
-			new Element("#col_options").toggleClass("t_edit",types.val() != "");
-		});
+		var types = form.find("[name=type]");
+		function changeFieldType() {
+			form.find("table").attr("class","").toggleClass("t_"+types.val());
+		}
+		types.change(function(_) changeFieldType());
+		changeFieldType();
+
 		new Element("<option>").attr("value", "").text("--- Select ---").appendTo(types);
 		for( t in base.getCustomTypes() )
 			new Element("<option>").attr("value", "" + t.name).text(t.name).appendTo(types);