##// END OF EJS Templates
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

File last commit:

r4026:a60a0e90 default
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
index.html
103 lines | 2.7 KiB | text/html | HtmlLexer
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>CodeMirror: Velocity mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
<script src="velocity.js"></script>
<link rel="stylesheet" href="../../theme/night.css">
<style>.CodeMirror {border: 1px solid black;}</style>
<link rel="stylesheet" href="../../doc/docs.css">
</head>
<body>
<h1>CodeMirror: Velocity mode</h1>
<form><textarea id="code" name="code">
## Velocity Code Demo
#*
based on PL/SQL mode by Peter Raganitsch, adapted to Velocity by Steve O'Hara ( http://www.pivotal-solutions.co.uk )
August 2011
*#
#*
This is a multiline comment.
This is the second line
*#
#[[ hello steve
This has invalid syntax that would normally need "poor man's escaping" like:
#define()
${blah
]]#
#include( "disclaimer.txt" "opinion.txt" )
#include( $foo $bar )
#parse( "lecorbusier.vm" )
#parse( $foo )
#evaluate( 'string with VTL #if(true)will be displayed#end' )
#define( $hello ) Hello $who #end #set( $who = "World!") $hello ## displays Hello World!
#foreach( $customer in $customerList )
$foreach.count $customer.Name
#if( $foo == ${bar})
it's true!
#break
#{else}
it's not!
#stop
#end
#if ($foreach.parent.hasNext)
$velocityCount
#end
#end
$someObject.getValues("this is a string split
across lines")
#macro( tablerows $color $somelist )
#foreach( $something in $somelist )
<tr><td bgcolor=$color>$something</td></tr>
#end
#end
#tablerows("red" ["dadsdf","dsa"])
Variable reference: #set( $monkey = $bill )
String literal: #set( $monkey.Friend = 'monica' )
Property reference: #set( $monkey.Blame = $whitehouse.Leak )
Method reference: #set( $monkey.Plan = $spindoctor.weave($web) )
Number literal: #set( $monkey.Number = 123 )
Range operator: #set( $monkey.Numbers = [1..3] )
Object list: #set( $monkey.Say = ["Not", $my, "fault"] )
Object map: #set( $monkey.Map = {"banana" : "good", "roast beef" : "bad"})
The RHS can also be a simple arithmetic expression, such as:
Addition: #set( $value = $foo + 1 )
Subtraction: #set( $value = $bar - 1 )
Multiplication: #set( $value = $foo * $bar )
Division: #set( $value = $foo / $bar )
Remainder: #set( $value = $foo % $bar )
</textarea></form>
<script>
var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
tabMode: "indent",
theme: "night",
lineNumbers: true,
indentUnit: 4,
mode: "text/velocity"
});
</script>
<p><strong>MIME types defined:</strong> <code>text/velocity</code>.</p>
</body>
</html>