Skip to content

Commit

Permalink
Draft of the layout.
Browse files Browse the repository at this point in the history
  • Loading branch information
tjweir committed Nov 8, 2008
1 parent c7d1a17 commit a8ceac6
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 66 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ tmp*
temp*
dist
test-output
PocketChange/lift_example

# other scm
.svn
Expand Down
17 changes: 12 additions & 5 deletions PocketChange/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
<packaging>war</packaging>
<name>PocketChangeApp</name>
<inceptionYear>2008</inceptionYear>
<!--
<description>A Lift Application to support the Lift Book.</description>
-->
<properties>
<scala.version>2.7.1</scala.version>
</properties>
<!--
<developers>
<developer>
<id>dchenbecker</id>
Expand All @@ -23,19 +26,22 @@
<timezone>-5</timezone>
</developer>
</developers>

-->
<repositories>
<repository>
<id>scala-tools.org</id>
<name>Scala-Tools Maven2 Repository</name>
<url>http://scala-tools.org/repo-releases</url>
</repository>
<!-- JFree -->

<!--
<repository>
<id>ibiblio</id>
<name>Ibiblio Maven2 Repository</name>
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
</repository>
-->
<!--
<repository>
<id>JBoss</id>
Expand All @@ -49,15 +55,13 @@
</repository>
-->
<!-- for gnujaxp -->
<!--
<repository>
<id>Atlassian</id>
<name>Atlassian Maven2 Repository</name>
<url>http://repository.atlassian.com/maven2/</url>
</repository>




-->
</repositories>

<pluginRepositories>
Expand Down Expand Up @@ -102,11 +106,13 @@
<version>[6.1.6,)</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
<version>1.0.11</version>
</dependency>
-->
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand Down Expand Up @@ -196,3 +202,4 @@
</plugins>
</reporting>
</project>

14 changes: 1 addition & 13 deletions PocketChange/src/main/scala/bootstrap/liftweb/Boot.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,7 @@ class Boot {

object MenuInfo {
import Loc._

def menu: List[Menu] = Menu(Loc("home", List("index"), "Home")) ::
Menu(Loc("xml fun", List("xml_fun"), "XML Fun")) ::
Menu(Loc("chat", List("chat"), "Comet Chat")) ::
Menu(Loc("database", List("database"), "Database")) ::
Menu(Loc("ajax", List("ajax"), "AJAX Samples")) ::
Menu(Loc("ajax form", List("ajax-form"), "AJAX Form")) ::
Menu(Loc("json", List("json"), "JSON Messaging")) ::
Menu(Loc("template", List("template"), "Templates")) ::
Menu(Loc("ws", List("ws"), "Web Services")) ::
Menu(Loc("file_upload", List("file_upload"), "File Upload")) ::
// Menu(Loc("wiki", Link(List("wiki"), true, "/wiki/HomePage"), "Wiki")) ::
Nil
def menu: List[Menu] = Menu(Loc("home", List("index"), "Home")) :: Nil
}


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
package com.pocketchangeapp.snippet

//import scala.xml.NodeSeq

class HelloWorld {
def howdy = <span>Welcome to PocketChange at {new java.util.Date}</span>

/*
def makeChart: NodeSeq = {
<div>
<h2>Place Chart here</h2>
</div>
}
*/
}

3 changes: 1 addition & 2 deletions PocketChange/src/main/webapp/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<lift:surround with="default" at="content">
<h2>Welcome to your project!</h2>
<p><lift:helloWorld.howdy /></p>
<p><lift:helloWorld.makeChart /></p>
</lift:surround>

17 changes: 17 additions & 0 deletions PocketChange/src/main/webapp/style/pca.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#title {
color: white;
background: #D80000;
border: 1px solid #A80000;
padding: 10px;
margin-bottom: 15px;
font-size: 2.5em;
}

#entryform {
color: white;
background: #60a8c0;
border: 1px solid #2E7D9C;
padding: 10px;
margin-bottom: 15px;

}
85 changes: 39 additions & 46 deletions PocketChange/src/main/webapp/templates-hidden/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,65 +10,58 @@
<lift:CSS.fancyType />
<script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
<script id="json" src="/classpath/json.js" type="text/javascript"/>
<style>
/* <![CDATA[ */
.sidebar ul {
margin:0;
padding:0;
border-bottom:1px solid #ccc;
}


.sidebar ul li {
margin:0;
padding:0;
list-style:none;
border:1px solid #ccc;
border-bottom:none;
}

.sidebar ul li a {
display:block;
padding:3px;
text-indent:30px;
text-decoration:none;
}

.sidebar ul li a:hover {
background-color: #eee;
}


/* ]]> */
</style>
<link href="/style/pca.css" type="text/css" rel="stylesheet" media="screen, projection" />

</head>
<body>
<div class="container">
<div class="column span-12 last" style="text-align: right">
<h1 class="alt">PocketChange</h1>
<div class="column span-24">
<div id="title">PocketChange</div>
</div>

<hr/>

<div class="column span-6 colborder sidebar">
<hr class="space" />
<lift:Menu.builder />
<div>
<lift:snippet type="msgs"/>
<hr class="space" />
</div>
<div class="column span-24">
Vertical: <lift:Menu.builder />
</div>

<div class="column span-17 last">

<hr/>

<div class="column span-1">&nbsp;</div>
<div class="column span-22">
Messages: <lift:snippet type="msgs"/>
<br />
</div>
<div class="column span-1 last">&nbsp;</div>

<hr/>

<div class="column span-24">
<div id="entryform">Entry Form</div>
</div>

<hr/>

<div class="column span-2"></div>
<div class="column span-20">
<h2 class="alt">Table of Historic Expenses.</h2>
</div>
<div class="column span-2"></div>

<hr/>

<div class="column span-2"></div>
<div class="column span-20">
<lift:bind name="content" />
<br />
</div>
<div class="column span-2"></div>

<hr />
<div class="column span-23 last" style="text-align: center">
<h4 class="alt">
<a href="http://liftweb.net">
<i>lift</i>
</a> is Copyright 2007 WorldWide Conferencing, LLC. Distributed under an Apache 2.0 License.</h4>

<div class="column span-24 last" style="text-align: center">
I can lead a nation with a microphone.
</div>

</div>
Expand Down

0 comments on commit a8ceac6

Please sign in to comment.