Permalink
Browse files

Now set to us FoBo v2.9.3-SNAPSHOT Scala 2.9.2.

  • Loading branch information...
1 parent eb9d894 commit 85fae256fbc8a9e391b87282945384b74936ead2 @karma4u101 committed Mar 13, 2013
View
@@ -3,9 +3,11 @@ organization := "se.media4u101"
name := "FoBo-Lift-Template"
-version := "2.4.0-SNAPSHOT"
+version := "2.5.0-SNAPSHOT"
-scalaVersion := "2.10.0"
+crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1")
+
+scalaVersion := "2.9.2"
seq(com.github.siasia.WebPlugin.webSettings :_*)
@@ -26,16 +28,14 @@ EclipseKeys.withSource := true
transitiveClassifiers := Seq("sources")//,"javadocs")
libraryDependencies ++= {
- val liftVersion = "2.5-SNAPSHOT" // Put the current/latest lift version here
+ val liftVersion = "2.5-RC2" // Put the current/latest lift version here
Seq(
"net.liftweb" %% "lift-webkit" % liftVersion % "compile" withSources(),
"net.liftweb" %% "lift-mapper" % liftVersion % "compile",
"net.liftweb" %% "lift-squeryl-record" % liftVersion % "compile" withSources(),
"net.liftweb" %% "lift-wizard" % liftVersion % "compile",
"net.liftweb" %% "lift-testkit" % liftVersion % "compile",
- "net.liftmodules" %% "fobo-font-awesome" % (liftVersion+"-0.0.4-SNAPSHOT"),
- "net.liftmodules" %% "fobo-twitter-bootstrap" % (liftVersion+"-0.0.1-SNAPSHOT"),
- "net.liftmodules" %% "fobo" % (liftVersion+"-0.7.11-SNAPSHOT") withJavadoc() withSources()
+ "net.liftmodules" %% "fobo" % (liftVersion+"-0.9.3-SNAPSHOT") withJavadoc() withSources()
)
}
@@ -45,7 +45,7 @@ libraryDependencies <++= scalaVersion { sv =>
"log4j" % "log4j" % "1.2.16" % "provided" ::
"org.eclipse.jetty" % "jetty-webapp" % "8.0.3.v20111011" % "container" ::
"org.eclipse.jetty" % "jetty-plus" % "8.0.3.v20111011" % "container" ::
- "javax.servlet" % "servlet-api" % "2.5" % "provided->default" ::
+ //"javax.servlet" % "javax.servlet-api" % "3.0.1" % "provided->default" ::
"commons-lang" % "commons-lang" % "2.0" % "compile->default" ::
"com.jolbox" % "bonecp" % "0.7.1.RELEASE" % "compile->default" ::
"com.h2database" % "h2" % "1.3.167" ::
@@ -18,7 +18,7 @@ import _root_.net.liftweb.http.auth.{ HttpBasicAuthentication, AuthRole, userRol
import code.model._
import code.snippet._
-import net.liftmodules.{FoBo,FoBoFA,FoBoTB}
+import net.liftmodules.{FoBo/*,FoBoFA,FoBoTB*/}
object localeOverride extends SessionVar[Box[Locale]](Empty)
@@ -36,9 +36,10 @@ class Boot extends Loggable {
FoBo.InitParam.ToolKit=FoBo.JQueryMobile110
FoBo.InitParam.ToolKit=FoBo.DataTables190
FoBo.InitParam.ToolKit=FoBo.Knockout210
- FoBo.InitParam.ToolKit=FoBo.Bootstrap222
+ FoBo.InitParam.ToolKit=FoBo.Bootstrap230
//FoBoTB.InitParam.ToolKit=FoBoTB.Bootstrap222
- FoBo.InitParam.ToolKit=FoBo.FontAwesome200TB222
+ //FoBo.InitParam.ToolKit=FoBo.FontAwesome200TB222
+ FoBo.InitParam.ToolKit=FoBo.FontAwesome300
//FoBoFA.InitParam.ToolKit=FoBoFA.FontAwesome200TB222
FoBo.init()
@@ -13,6 +13,7 @@
<dependencies>
</dependencies>
+ <import-package> !org.apache.commons.codec*</import-package>
</environment>
<context-root>/fobo-lift-template-demo</context-root>
View
@@ -8,7 +8,7 @@
</head>
<body class="lift:content_id=fobo-main">
- <div id="fobo-main" class="lift:surround?with=default-TB;at=content">
+ <div id="fobo-main" class="lift:surround?with=default-TB;at=content;">
<!-- data-lift="head" <== merges data to the html head -->
<!-- Included your own app specific CSS File here -->
@@ -18,16 +18,16 @@
<link data-lift="head" rel="stylesheet" type='text/css' href="/classpath/fobo/themes/smoothness.css"/>
<link data-lift="head" rel="stylesheet" type='text/css' href="/classpath/fobo/jquery.dataTables_themeroller.css"/>
- <link data-lift="head" rel="stylesheet" type='text/css' href="/classpath/fobo/prettify.css">
+ <link data-lift="head" rel="stylesheet" type='text/css' href="/classpath/fobo/prettify.css"/>
<!-- replacing the bootstrap.css with a no icons variant as we are using font-awesome for icons -->
<!-- <link data-lift="head" rel="stylesheet" type='text/css' href="/classpath/fobo/bootstrap-no-icons.css"/> -->
<link data-lift="head" rel="stylesheet" type='text/css' href="/classpath/fobo/bootstrap.css"/>
<link data-lift="head" rel="stylesheet" type='text/css' href="/classpath/fobo/bootstrap-responsive.css"/>
- <link data-lift="head" rel="stylesheet" href="/classpath/fobo/font-awesome.css">
+ <link data-lift="head" rel="stylesheet" href="/classpath/fobo/font-awesome.css"/>
<!-- Included APP. SPECIFIC CSS Files -->
- <link data-lift="head" rel="stylesheet" type='text/css' href="/resources/css/dt-app.css">
- <link data-lift="head" rel="stylesheet" type='text/css' href="/resources/css/front-app.css">
+ <link data-lift="head" rel="stylesheet" type='text/css' href="/resources/css/dt-app.css"/>
+ <link data-lift="head" rel="stylesheet" type='text/css' href="/resources/css/front-app.css"/>
@@ -375,18 +375,55 @@ <h2 class="capital">
<div class="row-fluid">
<div class="span12">
- <br/>
<a href="https://github.com/karma4u101/FoBo" class="btn btn-primary btn-large" style="font-size: 24px;"><i class="icon-github" ></i> &nbsp;FoBo on GitHub</a>
+
+ </div>
+ </div>
+<!--
+ <div class="row-fluid">
+ <div class="span12">
+ <br/>
+<a class="twitter-timeline" href="https://twitter.com/search?q=%23LiftWeb" data-widget-id="308285580251373568">Tweets about "#LiftWeb"</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
+
+
+ <div class="row-fluid">
+ <div class="span12">
+
+<a class="twitter-timeline" href="https://twitter.com/karma4u101" data-widget-id="308273193272098816">Tweets by @karma4u101</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+ </div>
+ </div>
+
+
+ <div class="row-fluid">
+ <div class="span12">
+
+<a class="twitter-timeline" href="https://twitter.com/search?q=%23LiftFoBo" data-widget-id="308289356710428673">Tweets about "#LiftFoBo"</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+ </div>
+ </div>
+-->
<div class="row-fluid">
<div class="span12">
<h2 class="capital">
<i class="icon-bookmark" style="vertical-align:center;"></i>&nbsp;S<span>ocial</span>
</h2>
+ <br/>
+<a class="twitter-timeline" href="https://twitter.com/search?q=%23LiftWeb" data-widget-id="308285580251373568">Tweets about "#LiftWeb"</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+ <br/>
+<a class="twitter-timeline" href="https://twitter.com/karma4u101" data-widget-id="308273193272098816">Tweets by @karma4u101</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+ <br/>
+<a class="twitter-timeline" href="https://twitter.com/search?q=%23LiftFoBo" data-widget-id="308289356710428673">Tweets about "#LiftFoBo"</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+ <br/>
<div class="g-plusone" data-size="medium"></div>
<br/>
<a href="https://twitter.com/karma4u101"
@@ -251,9 +251,7 @@ <h2 class="capital">
<p>
With FoBo included Bootstrap v2.2.2+ you can optionally replace the bootstrap provided icon set with <a
href="http://fortawesome.github.com/Font-Awesome/">Font Awesome</a>
- this is done by using the init parram <code>FoBo.InitParam.ToolKit=FoBo.FontAwesomeXYZ</code> or
- <code>FoBo.InitParam.ToolKit=FoBo.FontAwesomeXYZTBXYZ</code> the later will give font-awesome
- a hint that your are using it with Twitter Bootstrap version XYZ.
+ this is done by using the init parram <code>FoBo.InitParam.ToolKit=FoBo.FontAwesomeXYZ</code>.
</p>
<div class="alert alert-info">
@@ -262,33 +260,34 @@ <h2 class="capital">
<div class="label">Font Awesome - Boot.scala Setup</div>
<pre class="prettyprint linenums lang-scala">⋮
FoBo.InitParam.ToolKit=FoBo.Bootstrap222
-FoBo.InitParam.ToolKit=FoBo.FontAwesome200TB222
+FoBo.InitParam.ToolKit=FoBo.FontAwesome300
FoBo.init()
⋮</pre>
<div class="label">Font Awesome - Template Setup</div>
-<pre class="prettyprint linenums lang-html">&lt;!-- replacing the bootstrap.css with a no icons variant as we are using font-awesome for icons --&gt;
-&lt;link rel="stylesheet" type='text/css' href="/classpath/fobo/bootstrap.css"/&gt;
+<pre class="prettyprint linenums lang-html">&lt;link rel="stylesheet" type='text/css' href="/classpath/fobo/bootstrap.css"/&gt;
+ :
&lt;link rel="stylesheet" href="/classpath/fobo/font-awesome.css"&gt;</pre>
- <div class="alert alert-info">
- If you are using FoBo v0.7.10-SNAPSHOT with FoBo.Bootstrap222 and FoBo.FontAwesome200
- you need to explicitly specify that you are using a font-awesome modified bootstrap css in
- your template as <code>bootstrap-no-icons.css</code>.
- In newer version of FoBo with for example the FoBo.FontAwesome200TB222 (font-awesome for twitter bootstrap v2.2.2)
- declaration FoBo will automatically identify that you are using font-awesome and serve the correct bootsrap css
- without a explicit "-no-icons" specification in the css file name.
- </div>
-
-
- <div class="label" style="margin-bottom:5px;">Font Awesome Example - Rendering login icons</div>
+<!-- <div class="alert alert-info"> -->
+<!-- If you are using FoBo v0.7.10-SNAPSHOT with FoBo.Bootstrap222 and FoBo.FontAwesome200 -->
+<!-- you need to explicitly specify that you are using a font-awesome modified bootstrap css in -->
+<!-- your template as <code>bootstrap-no-icons.css</code>. -->
+<!-- In newer version of FoBo with for example the FoBo.FontAwesome200TB222 (font-awesome for twitter bootstrap v2.2.2) -->
+<!-- declaration FoBo will automatically identify that you are using font-awesome and serve the correct bootsrap css -->
+<!-- without a explicit "-no-icons" specification in the css file name. -->
+<!-- </div> -->
+
+
+ <div class="label" style="margin-bottom:5px;">Font Awesome Example - Rendering login icons</div>
+
<form>
<div class="input-prepend">
<span class="add-on"><i class="icon-envelope"></i></span>
- <input class="span2" type="text" placeholder="Email address">
+ <input class="span9" type="text" placeholder="Email address">
</div>
<div class="input-prepend">
<span class="add-on"><i class="icon-key"></i></span>
- <input class="span2" type="password" placeholder="Password">
+ <input class="span9" type="password" placeholder="Password">
</div>
</form>

0 comments on commit 85fae25

Please sign in to comment.