Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
author: John Mayhew 2012-05-07 16:30:19 -0700
committer: John Mayhew 2012-05-07 16:30:19 -0700
commit: db4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree: 8b79ad58108af2f17d15abc8cdc33d35229ab20d /imports/codemirror/mode/smarty/index.html
parent: 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent: 526e423e4a2734c2b139af23911e912452a4443f (diff)
download: ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
1 files changed, 82 insertions, 0 deletions
diff --git a/imports/codemirror/mode/smarty/index.html b/imports/codemirror/mode/smarty/index.html
new file mode 100644
index 00000000..ad4dccf0
--- /dev/null
+++ b/imports/codemirror/mode/smarty/index.html
@@ -0,0 +1,82 @@
+<!doctype html>
+<html>
+  <head>
+    <title>CodeMirror: Smarty mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="smarty.js"></script>
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <link rel="stylesheet" href="../../doc/docs.css">
+  </head>
+  <body>
+    <h1>CodeMirror: Smarty mode</h1>
+    <form><textarea id="code" name="code">
+{extends file="parent.tpl"}
+{include file="template.tpl"}
+{* some example Smarty content *}
+{if isset($name) && $name == 'Blog'}
+  This is a {$var}.
+  {$integer = 451}, {$array[] = "a"}, {$stringvar = "string"}
+  {assign var='bob' value=$var.prop}
+{elseif $name == $foo}
+  {function name=menu level=0}
+    {foreach $data as $entry}
+      {if is_array($entry)}
+        - {$entry@key}
+        {menu data=$entry level=$level+1}
+      {else}
+        {$entry}
+      {/if}
+    {/foreach}
+  {/function}
+{/if}</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "smarty"
+      });
+    </script>
+    <br />
+    <form><textarea id="code2" name="code2">
+{--extends file="parent.tpl"--}
+{--include file="template.tpl"--}
+{--* some example Smarty content *--}
+{--if isset($name) && $name == 'Blog'--}
+  This is a {--$var--}.
+  {--$integer = 451--}, {--$array[] = "a"--}, {--$stringvar = "string"--}
+  {--assign var='bob' value=$var.prop--}
+{--elseif $name == $foo--}
+  {--function name=menu level=0--}
+    {--foreach $data as $entry--}
+      {--if is_array($entry)--}
+        - {--$entry@key--}
+        {--menu data=$entry level=$level+1--}
+      {--else--}
+        {--$entry--}
+      {--/if--}
+    {--/foreach--}
+  {--/function--}
+{--/if--}</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code2"), {
+        lineNumbers: true,
+        mode: {
+          name: "smarty",
+          leftDelimiter: "{--",
+          rightDelimiter: "--}"
+        }
+      });
+    </script>
+    <p>A plain text/Smarty mode which allows for custom delimiter tags (defaults to <b>{</b> and <b>}</b>).</p>
+    <p><strong>MIME types defined:</strong> <code>text/x-smarty</code></p>
+  </body>
+</html>
author	John Mayhew	2012-05-07 16:30:19 -0700
committer	John Mayhew	2012-05-07 16:30:19 -0700
commit	db4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree	8b79ad58108af2f17d15abc8cdc33d35229ab20d /imports/codemirror/mode/smarty/index.html
parent	843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent	526e423e4a2734c2b139af23911e912452a4443f (diff)
download	ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz

diff --git a/imports/codemirror/mode/smarty/index.html b/imports/codemirror/mode/smarty/index.html new file mode 100644 index 00000000..ad4dccf0 --- /dev/null +++ b/imports/codemirror/mode/smarty/index.html
@@ -0,0 +1,82 @@
	1	<!doctype html>
	2	<html>
	3	<head>
	4	<title>CodeMirror: Smarty mode</title>
	5	<link rel="stylesheet" href="../../lib/codemirror.css">
	6	<script src="../../lib/codemirror.js"></script>
	7	<script src="smarty.js"></script>
	8	<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
	9	<link rel="stylesheet" href="../../doc/docs.css">
	10	</head>
	11	<body>
	12	<h1>CodeMirror: Smarty mode</h1>
	13
	14	<form><textarea id="code" name="code">
	15	{extends file="parent.tpl"}
	16	{include file="template.tpl"}
	17
	18	{* some example Smarty content *}
	19	{if isset($name) && $name == 'Blog'}
	20	This is a {$var}.
	21	{$integer = 451}, {$array[] = "a"}, {$stringvar = "string"}
	22	{assign var='bob' value=$var.prop}
	23	{elseif $name == $foo}
	24	{function name=menu level=0}
	25	{foreach $data as $entry}
	26	{if is_array($entry)}
	27	- {$entry@key}
	28	{menu data=$entry level=$level+1}
	29	{else}
	30	{$entry}
	31	{/if}
	32	{/foreach}
	33	{/function}
	34	{/if}</textarea></form>
	35
	36	<script>
	37	var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
	38	lineNumbers: true,
	39	mode: "smarty"
	40	});
	41	</script>
	42
	43	<br />
	44
	45	<form><textarea id="code2" name="code2">
	46	{--extends file="parent.tpl"--}
	47	{--include file="template.tpl"--}
	48
	49	{--* some example Smarty content *--}
	50	{--if isset($name) && $name == 'Blog'--}
	51	This is a {--$var--}.
	52	{--$integer = 451--}, {--$array[] = "a"--}, {--$stringvar = "string"--}
	53	{--assign var='bob' value=$var.prop--}
	54	{--elseif $name == $foo--}
	55	{--function name=menu level=0--}
	56	{--foreach $data as $entry--}
	57	{--if is_array($entry)--}
	58	- {--$entry@key--}
	59	{--menu data=$entry level=$level+1--}
	60	{--else--}
	61	{--$entry--}
	62	{--/if--}
	63	{--/foreach--}
	64	{--/function--}
	65	{--/if--}</textarea></form>
	66
	67	<script>
	68	var editor = CodeMirror.fromTextArea(document.getElementById("code2"), {
	69	lineNumbers: true,
	70	mode: {
	71	name: "smarty",
	72	leftDelimiter: "{--",
	73	rightDelimiter: "--}"
	74	}
	75	});
	76	</script>
	77
	78	<p>A plain text/Smarty mode which allows for custom delimiter tags (defaults to <b>{</b> and <b>}</b>).</p>
	79
	80	<p><strong>MIME types defined:</strong> <code>text/x-smarty</code></p>
	81	</body>
	82	</html>