diff options
author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
tree | c702d67585f72cddf55932411e7100133bc58452 /js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | |
parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html')
-rw-r--r-- | js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html new file mode 100644 index 00000000..14d6cb55 --- /dev/null +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | |||
@@ -0,0 +1,87 @@ | |||
1 | <!DOCTYPE HTML> | ||
2 | <!-- <copyright> | ||
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/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html> | ||
8 | <head> | ||
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
10 | <link rel="stylesheet" type="text/css" href="code-editor-view-options.css"> | ||
11 | <script type="text/montage-serialization"> | ||
12 | { | ||
13 | "codeCompleteCheck":{ | ||
14 | "prototype": "montage/ui/checkbox.reel", | ||
15 | "properties": { | ||
16 | "element": {"#": "codeComplete"} | ||
17 | } | ||
18 | }, | ||
19 | |||
20 | "zoomHottext": { | ||
21 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | ||
22 | "properties": { | ||
23 | "element": {"#": "zoomFont"}, | ||
24 | "minValue":100, | ||
25 | "maxValue" :200, | ||
26 | "stepSize" :10, | ||
27 | "acceptableUnits" : ["%"], | ||
28 | "units" : "%" | ||
29 | } | ||
30 | }, | ||
31 | |||
32 | "owner":{ | ||
33 | "prototype": "js/code-editor/ui/code-editor-view-options.reel[CodeEditorViewOptions]", | ||
34 | "properties": { | ||
35 | "element": {"#": "viewOptions"}, | ||
36 | "codeCompleteCheck":{"@": "codeCompleteCheck"}, | ||
37 | "zoomHottext":{"@":"zoomHottext"}, | ||
38 | "comment":{"#":"comment"}, | ||
39 | "uncomment":{"#":"uncomment"}, | ||
40 | "themeSelect":{"#":"themeSelect"}, | ||
41 | "shortKeys":{"#":"shortKeys"} | ||
42 | } | ||
43 | } | ||
44 | } | ||
45 | </script> | ||
46 | </head> | ||
47 | <body> | ||
48 | <div data-montage-id="viewOptions" class="viewOptions"> | ||
49 | <div> | ||
50 | <input class="zoomFont" data-montage-id="zoomFont"/> | ||
51 | <div class="autoCodeComplete" > | ||
52 | <input type="checkbox" data-montage-id="codeComplete" /> | ||
53 | <span>Automatic Completion</span> | ||
54 | </div> | ||
55 | <div class="floatButtons"> | ||
56 | <!--<button disabled="disabled" id="format" value="format" class="nj-skinned format">Format</button>--> | ||
57 | <button data-montage-id="comment" value="comment" class="nj-skinned format">comment</button> | ||
58 | <button data-montage-id="uncomment" value="uncomment" class="nj-skinned format">uncomment</button> | ||
59 | </div> | ||
60 | <div class="themeOptions"> | ||
61 | <span>Theme :</span> | ||
62 | <select data-montage-id="themeSelect"> | ||
63 | <option value="default" selected="">DEFAULT</option> | ||
64 | <option value="night">NIGHT</option> | ||
65 | <option value="monokai" >MONOKAI</option> | ||
66 | <option value="neat" >NEAT</option> | ||
67 | <option value="elegant" >ELEGANT</option> | ||
68 | <option value="cobalt" >COBALT</option> | ||
69 | <option value="eclipse" >ECLIPSE</option> | ||
70 | <option value="rubyblue" >RUBYBLUE</option> | ||
71 | <option value="lesser-dark" >LESSER-DARK</option> | ||
72 | <option value="xq-dark" >XQ-DARK</option> | ||
73 | </select> | ||
74 | </div> | ||
75 | <div data-montage-id="shortKeys" class="shortKeys"> | ||
76 | <div class="list hide"> | ||
77 | <div><span class="shortKey">ctrl+space :</span> <span class="shortKeyDesc">code hints</span></div> | ||
78 | <div><span class="shortKey">ctrl+/ :</span> <span class="shortKeyDesc">comment selection</span></div> | ||
79 | <div><span class="shortKey">ctrl+shift+/ :</span> <span class="shortKeyDesc">uncomment selection</span></div> | ||
80 | </div> | ||
81 | <span>ShortKeys</span> | ||
82 | <span class="dropdownArrow">▼</span> | ||
83 | </div> | ||
84 | </div> | ||
85 | </div> | ||
86 | </body> | ||
87 | </html> \ No newline at end of file | ||