upstream/kallithea Files · rhodecode/public/js/mode/smarty/index.html

Migrate to Mergely 3.3.4....

Migrate to Mergely 3.3.4. RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be changes we want for Kallithea this way and we take the 3.3.4 files as they are. I've also included the Mergely license file, as downloaded from: http://www.mergely.com/license.php That LICENSE file is kept in HTML just as it was downloaded from their website. While it's a bit annoying to keep the license file in HTML, this is the way it came from upstream so we'll leave it that way. Since the Javascript code is used with other GPLv3 Javascript, we are using the GPL option of Mergely's tri-license. Finally, note that previously, this was incorrectly called "mergerly", so the opportunity is taken here to correct the name. That required changes to diff_2way.html. As commands:: $ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php $ hg add LICENSE-MERGELY.html $ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css $ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js $ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html $ ( cd /tmp; \ wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \ unzip mergely-3.3.4.zip ) $ sha256sum /tmp/mergely-3.3.4.zip 87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip $ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js $ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css $ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css

marcink - - Load All Authors

File last commit:

r4029:c9bcfe2d default


                r4125:aa3b5594

rhodecode-2.2.5-gpl

Download file

             index.html
        
                    126 lines
            
             | 3.4 KiB
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / public / js / mode / smarty / index.html
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
      <!doctype html>

      <html>

        <head>

          <meta charset="utf-8">

          <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>

        marcink
    
codecleaner

              r4029
            
          <h3>Default settings (Smarty 2, <b>{</b> and <b>}</b> delimiters)</h3>

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
          <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 />

        marcink
    
codecleaner

              r4029
            
          <h3>Smarty 2, custom delimiters</h3>

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
          <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>

        marcink
    
codecleaner

              r4029
            
          <br />

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
        marcink
    
codecleaner

              r4029
            
          <h3>Smarty 3</h3>

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
        marcink
    
codecleaner

              r4029
            
          <textarea id="code3" name="code3">

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
      Nested tags {$foo={counter one=1 two={inception}}+3} are now valid in Smarty 3.

      <script>

      function test() {

        marcink
    
codecleaner

              r4029
            
          console.log("Smarty 3 permits single curly braces followed by whitespace to NOT slip into Smarty mode.");

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
      }

      </script>

      {assign var=foo value=[1,2,3]}

      {assign var=foo value=['y'=>'yellow','b'=>'blue']}

      {assign var=foo value=[1,[9,8],3]}

      {$foo=$bar+2} {* a comment *}

      {$foo.bar=1}  {* another comment *}

      {$foo = myfunct(($x+$y)*3)}

      {$foo = strlen($bar)}

      {$foo.bar.baz=1}, {$foo[]=1}

      Smarty "dot" syntax (note: embedded {} are used to address ambiguities):

      {$foo.a.b.c}      => $foo['a']['b']['c']

      {$foo.a.$b.c}     => $foo['a'][$b]['c']

      {$foo.a.{$b+4}.c} => $foo['a'][$b+4]['c']

      {$foo.a.{$b.c}}   => $foo['a'][$b['c']]

      {$object->method1($x)->method2($y)}</textarea>

        marcink
    
codecleaner

              r4029
            
          <script>

              var editor = CodeMirror.fromTextArea(document.getElementById("code3"), {

                  lineNumbers: true,

                  mode: "smarty",

                  smartyVersion: 3

              });

          </script>

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
          <p>A plain text/Smarty version 2 or 3 mode, which allows for custom delimiter tags.</p>

          <p><strong>MIME types defined:</strong> <code>text/x-smarty</code></p>

        </body>

      </html>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

marcink added codemirror edit mode with autodetection	r4026	<!doctype html>
		<html>
		<head>
		<meta charset="utf-8">
		<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>

marcink codecleaner	r4029	<h3>Default settings (Smarty 2, <b>{</b> and <b>}</b> delimiters)</h3>
marcink added codemirror edit mode with autodetection	r4026	<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 />

marcink codecleaner	r4029	<h3>Smarty 2, custom delimiters</h3>
marcink added codemirror edit mode with autodetection	r4026	<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>

marcink codecleaner	r4029	<br />
marcink added codemirror edit mode with autodetection	r4026
marcink codecleaner	r4029	<h3>Smarty 3</h3>
marcink added codemirror edit mode with autodetection	r4026
marcink codecleaner	r4029	<textarea id="code3" name="code3">
marcink added codemirror edit mode with autodetection	r4026	Nested tags {$foo={counter one=1 two={inception}}+3} are now valid in Smarty 3.

		<script>
		function test() {
marcink codecleaner	r4029	console.log("Smarty 3 permits single curly braces followed by whitespace to NOT slip into Smarty mode.");
marcink added codemirror edit mode with autodetection	r4026	}
		</script>

		{assign var=foo value=[1,2,3]}
		{assign var=foo value=['y'=>'yellow','b'=>'blue']}
		{assign var=foo value=[1,[9,8],3]}

		{$foo=$bar+2} {* a comment *}
		{$foo.bar=1} {* another comment *}
		{$foo = myfunct(($x+$y)*3)}
		{$foo = strlen($bar)}
		{$foo.bar.baz=1}, {$foo[]=1}

		Smarty "dot" syntax (note: embedded {} are used to address ambiguities):

		{$foo.a.b.c} => $foo['a']['b']['c']
		{$foo.a.$b.c} => $foo['a'][$b]['c']
		{$foo.a.{$b+4}.c} => $foo['a'][$b+4]['c']
		{$foo.a.{$b.c}} => $foo['a'][$b['c']]

		{$object->method1($x)->method2($y)}</textarea>

marcink codecleaner	r4029	<script>
		var editor = CodeMirror.fromTextArea(document.getElementById("code3"), {
		lineNumbers: true,
		mode: "smarty",
		smartyVersion: 3
		});
		</script>
marcink added codemirror edit mode with autodetection	r4026

		<p>A plain text/Smarty version 2 or 3 mode, which allows for custom delimiter tags.</p>

		<p><strong>MIME types defined:</strong> <code>text/x-smarty</code></p>
		</body>
		</html>