diff options
author | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
commit | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch) | |
tree | e385beee8f2694596f6305bf90eb7eb4521de2e2 /js/components/tools-properties/tag-properties.reel/tag-properties.html | |
parent | bdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-92fcb770aff434e994e7a39a61d8fac4a017dca0.tar.gz |
Merge branch 'refs/heads/master' into dom-architecture
Conflicts:
js/document/templates/montage-html/package.json
js/io/system/ninjalibrary.json
node_modules/descriptor.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/tools-properties/tag-properties.reel/tag-properties.html')
-rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.html | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index edc2d47f..87f87aff 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -17,6 +17,8 @@ | |||
17 | "properties": { | 17 | "properties": { |
18 | "element": {"#": "tagProperties"}, | 18 | "element": {"#": "tagProperties"}, |
19 | 19 | ||
20 | "_fillColorCtrl": {"#": "fillColorCtrl"}, | ||
21 | |||
20 | "divElement": {"#": "divTool"}, | 22 | "divElement": {"#": "divTool"}, |
21 | "imageElement": {"#": "imageTool"}, | 23 | "imageElement": {"#": "imageTool"}, |
22 | "videoElement": {"#": "videoTool"}, | 24 | "videoElement": {"#": "videoTool"}, |
@@ -35,25 +37,27 @@ | |||
35 | </head> | 37 | </head> |
36 | 38 | ||
37 | <body> | 39 | <body> |
38 | <div data-montage-id="tagProperties" class="subToolHolderPanel"> | 40 | <div data-montage-id="tagProperties" class="subToolHolderPanel toolOptionsFloatChildren"> |
39 | <div id="tagToolContainer" class="tagRadioButtons"> | 41 | <div data-montage-id="tagToolContainer" class="tagRadioButtons toolOptionsFloatChildren"> |
40 | <input type="radio" id="divTool" data-montage-id="divTool" class="tag-type" title="Div Element" name="TagRadios" value="div" checked/> | 42 | <input type="radio" data-montage-id="divTool" class="toolOptsRadioButton divTool" title="Div Element" name="TagRadios" value="div" checked/> |
41 | <input type="radio" id="imageTool" data-montage-id="imageTool" class="tag-type" title="Image Element" value="image" name="TagRadios"/> | 43 | <input type="radio" data-montage-id="imageTool" class="toolOptsRadioButton imageTool" title="Image Element" name="TagRadios" value="image"/> |
42 | <input type="radio" id="videoTool" data-montage-id="videoTool" class="tag-type" title="Video Element" value="video" name="TagRadios"/> | 44 | <input type="radio" data-montage-id="videoTool" class="toolOptsRadioButton videoTool" title="Video Element" name="TagRadios" value="video"/> |
43 | <input type="radio" id="canvasTool" data-montage-id="canvasTool" class="tag-type" title="Canvas Element" value="canvas" name="TagRadios"/> | 45 | <input type="radio" data-montage-id="canvasTool" class="toolOptsRadioButton canvasTool" title="Canvas Element" name="TagRadios" value="canvas"/> |
44 | <input type="radio" id="customTool" data-montage-id="customTool" class="tag-type" title="Custom Element" value="custom" name="TagRadios"/> | 46 | <input type="radio" data-montage-id="customTool" class="toolOptsRadioButton customTool" title="Custom Element" name="TagRadios" value="custom"/> |
45 | 47 | ||
46 | <div class="nj-divider divider-vertical"> </div> | 48 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
47 | 49 | ||
48 | <div id="classNameContainer" class="leftLabel"> | 50 | <div class="toolColorChipIcon FillTool"></div> |
49 | <label class="label"> Class: | 51 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> |
50 | <input data-montage-id="className" type="text" name="ClassNameTextBox" class="textBox nj-skinned"> | 52 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
51 | </label> | 53 | |
54 | <div id="classNameContainer"> | ||
55 | <label class="label"> Class:</label> | ||
56 | <input data-montage-id="className" type="text" name="ClassNameTextBox" class="textBox nj-skinned"/> | ||
52 | </div> | 57 | </div> |
53 | 58 | ||
54 | <div id="customContainer" class="leftLabel" style="padding-top: 3px;"> | 59 | <div id="customContainer"> |
55 | <label class="label"> Tag Name:</label> | 60 | <label class="label"> Tag Name:</label> |
56 | |||
57 | <select data-montage-id="customTagCB" class="nj-skinned"> | 61 | <select data-montage-id="customTagCB" class="nj-skinned"> |
58 | <option>article</option> | 62 | <option>article</option> |
59 | <option>aside</option> | 63 | <option>aside</option> |
@@ -61,11 +65,8 @@ | |||
61 | </select> | 65 | </select> |
62 | </div> | 66 | </div> |
63 | 67 | ||
64 | 68 | <div id="positionContainer"> | |
65 | |||
66 | <div id="positionContainer" class="leftLabel" style="padding-top: 3px;"> | ||
67 | <label class="label"> Position:</label> | 69 | <label class="label"> Position:</label> |
68 | |||
69 | <select data-montage-id="positionCB" class="nj-skinned"> | 70 | <select data-montage-id="positionCB" class="nj-skinned"> |
70 | <option>Static</option> | 71 | <option>Static</option> |
71 | <option>Absolute</option> | 72 | <option>Absolute</option> |
@@ -73,10 +74,7 @@ | |||
73 | <option>Fixed</option> | 74 | <option>Fixed</option> |
74 | <option>Inherit</option> | 75 | <option>Inherit</option> |
75 | </select> | 76 | </select> |
76 | |||
77 | </div> | 77 | </div> |
78 | |||
79 | |||
80 | </div> | 78 | </div> |
81 | </div> | 79 | </div> |
82 | </body> | 80 | </body> |