Skip to content

Commit

Permalink
updated.
Browse files Browse the repository at this point in the history
  • Loading branch information
robin committed Jan 3, 2013
1 parent 43d9af3 commit edde070
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ class HelloWorld {
// replace the contents of the element with id "time" with the date
def howdy = "#time *" #> date.map(_.toString)

def test = "*" #> <strong>oi oi mannn!</strong>
def test = "*" #>
<strong>oi oi mannn!</strong><br /><span>Yihaaaa!</span>
<br />
<span>Yihaa lagi :D</span>

/*
lazy val date: Date = DependencyFactory.time.vend // create the date via factory
def howdy = "#time *" #> date.toString
*/
}

20 changes: 20 additions & 0 deletions scala/liftweb/scala_29/lift_basic/src/main/webapp/foo/bar.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html xmlns:lift="http://www.w3.org/1999/xhtml">
<head>



</head>
<body class="lift:content_id=main2">

<div id="main2">

<lift:head>
<style type="text/css" href="test"></style>
</lift:head>

Oke doke
</div>

</body>
</html>
7 changes: 5 additions & 2 deletions scala/liftweb/scala_29/lift_basic/src/main/webapp/test.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<!DOCTYPE html>
<html>
<html xmlns:lift="http://www.w3.org/1999/html">
<head>
<title></title>
</head>
<body class="lift:content_id=main">

<div id="main" class="lift:surround?with=default;at=content">
<div lift="helloWorld.test"></div>

<lift:embed what="foo/bar" />

</div>
</body>
</html>
</html>

0 comments on commit edde070

Please sign in to comment.