Permalink
Browse files

Moving JQuery-Mobile to its own sub module. Adopting new version schema.

  • Loading branch information...
karma4u101 committed Mar 24, 2013
1 parent 9be8a40 commit 4df5ed682e5d722a4db4862b5cd2e29ab5e30694
Showing with 509 additions and 108 deletions.
  1. +34 −4 DataTables/README.md
  2. +32 −2 Font-Awesome/README.md
  3. +1 −1 Font-Awesome/src/main/scala/net/liftmodules/FoBoFA/FoBoFA.scala
  4. +3 −0 JQuery-Mobile/.gitignore
  5. 0 {src/main/resources/toserve/fobo/jquery-mobile → JQuery-Mobile}/LICENSE.txt
  6. +114 −0 JQuery-Mobile/README.md
  7. +144 −0 JQuery-Mobile/build.sbt
  8. 0 { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.0.1/css/jquery.mobile-1.0.1.css
  9. 0 ...Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.0.1/css/jquery.mobile.structure-1.0.1.css
  10. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.0.1/images/ajax-loader.png
  11. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.0.1/images/icons-18-black.png
  12. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.0.1/images/icons-18-white.png
  13. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.0.1/images/icons-36-black.png
  14. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.0.1/images/icons-36-white.png
  15. 0 { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.0.1/js/jquery.mobile-1.0.1.js
  16. 0 ...ery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.0.1/js/jquery.mobile.themeswitcher.js
  17. 0 { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/css/jquery.mobile-1.1.0.css
  18. 0 ...Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/css/jquery.mobile.structure-1.1.0.css
  19. 0 ...ery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/css/jquery.mobile.theme-1.1.0.css
  20. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/images/ajax-loader.gif
  21. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/images/ajax-loader.png
  22. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/images/icons-18-black.png
  23. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/images/icons-18-white.png
  24. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/images/icons-36-black.png
  25. BIN { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/images/icons-36-white.png
  26. 0 { → JQuery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/js/jquery.mobile-1.1.0.js
  27. 0 ...ery-Mobile}/src/main/resources/toserve/fobo/jquery-mobile/1.1.0/js/jquery.mobile.themeswitcher.js
  28. +2 −0 JQuery-Mobile/src/main/resources/toserve/fobo/jquery-mobile/LICENSE.txt
  29. +74 −0 JQuery-Mobile/src/main/scala/net/liftmodules/FoBoJQM/FoBoJQM.scala
  30. +31 −1 Knockout/README.md
  31. +1 −1 Knockout/src/main/scala/net/liftmodules/FoBoKO/FoBoKO.scala
  32. +34 −9 README.md
  33. +31 −1 Twitter-Bootstrap/README.md
  34. +1 −1 Twitter-Bootstrap/src/main/scala/net/liftmodules/FoBoTB/FoBoTB.scala
  35. +1 −0 build.sbt
  36. +5 −2 project/LiftModuleBuild.scala
  37. +1 −86 src/main/scala/net/liftmodules/FoBo/FoBo.scala
View
@@ -41,15 +41,45 @@ The following describes how to set up the module in your project **as a separate
For more information on how to use DataTables see the [FoBo Demo](http://www.media4u101.se/fobo-lift-template-demo/) and [FoBo](https://github.com/karma4u101/FoBo/blob/master/README.md).
-### Dependancy
+### Dependancy settings
-Put the following in your project build.sbt files lift libraryDependencies section
+For module versions >= 0.9.3 put the following in your project build.sbt files lift libraryDependencies section
+
+ "net.liftmodules" %% "moduleName_x1.y1 % "x2.y2[.z2][-SNAPSHOT/rcx/mx]"
+
+or if you are using Maven
+
+ <dependency>
+ <groupId>net.liftmodules</groupId>
+ <artifactId>moduleName_x1.y1_a.b.c</artifactId>
+ <version>x2.y2[.z2][-SNAPSHOT/rcx/mx]</version>
+ </dependency>
+
+Where x1.y1 is Lift major and minor version numbers and a.b.c is Scala
+version number and x2.y2.[z2] is the module's major x2, minor y2 and
+eventual incremental numbers z2 followed by a eventual SNAPSHOT
+release candidate (rcX) or milestone (mX) version part.
+
+For example:
+
+ "net.liftmodules" %% "fobo-datatables_2.5 % "0.1.0-SNAPSHOT"
+ :
+ <dependency>
+ <groupId>net.liftmodules</groupId>
+ <artifactId>fobo-datatables_2.5_2.9.2</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+
+The example will include a module built for lift 2.5. If you are using maven observe that the artifact id also needs the Scala version.
+
+
+For older versions <= 0.9.2 put the following in your project build.sbt files lift libraryDependencies section
"net.liftmodules" %% "fobo-datatables" % (liftVersion+"-[module version]")
### Lift FoBo boot hooks
- import net.liftmodules.FoBo-DataTables
+ import net.liftmodules.FoBoDT
:
//Use this if you are planing to use the FoBo DataTables sub module without using the FoBo meta module.
FoBoDT.InitParam.ToolKit=FoBoDT.DataTablesXYZ
@@ -58,9 +88,9 @@ Put the following in your project build.sbt files lift libraryDependencies secti
### Lift FoBo Template hooks
- <script src="/classpath/fobo/jquery.dataTables.js" charset="utf-8" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="/classpath/fobo/themes/smoothness.css">
<link rel="stylesheet" type="text/css" href="/classpath/fobo/jquery.dataTables_themeroller.css">
+ <script src="/classpath/fobo/jquery.dataTables.js" charset="utf-8" type="text/javascript"></script>
For more information on how to use datatables see [DataTables.net](http://datatables.net/)
View
@@ -42,9 +42,39 @@ The following describes how to set up the module in your project **as a separate
For more information on how to use Font-Awesome see the [FoBo Demo](http://www.media4u101.se/fobo-lift-template-demo/libo) and [FoBo](https://github.com/karma4u101/FoBo/blob/master/README.md).
-### Dependancy
+### Dependency settings
-Put the following in your project build.sbt files lift libraryDependencies section
+For module versions >= 0.9.3 put the following in your project build.sbt files lift libraryDependencies section
+
+ "net.liftmodules" %% "moduleName_x1.y1 % "x2.y2[.z2][-SNAPSHOT/rcx/mx]"
+
+or if you are using Maven
+
+ <dependency>
+ <groupId>net.liftmodules</groupId>
+ <artifactId>moduleName_x1.y1_a.b.c</artifactId>
+ <version>x2.y2[.z2][-SNAPSHOT/rcx/mx]</version>
+ </dependency>
+
+Where x1.y1 is Lift major and minor version numbers and a.b.c is Scala
+version number and x2.y2.[z2] is the module's major x2, minor y2 and
+eventual incremental numbers z2 followed by a eventual SNAPSHOT
+release candidate (rcX) or milestone (mX) version part.
+
+For example:
+
+ "net.liftmodules" %% "fobo-font-awesome_2.5 % "0.1.0-SNAPSHOT"
+ :
+ <dependency>
+ <groupId>net.liftmodules</groupId>
+ <artifactId>fobo-font-awesome_2.5_2.9.2</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+
+The example will include a module built for lift 2.5. If you are using maven observe that the artifact id also needs the Scala version.
+
+
+For older versions <= 0.9.2 put the following in your project build.sbt files lift libraryDependencies section
"net.liftmodules" %% "fobo-font-awesome" % (liftVersion+"-[module version]")
@@ -8,7 +8,7 @@ import common._
package object FoBoFA {
def init() {
- LiftRules.addToPackages("net.liftmodules.FoBo")
+ LiftRules.addToPackages("net.liftmodules.FoBoFA")
ResourceServer.allow {
case "fobo" :: tail => true
}
View
@@ -0,0 +1,3 @@
+/.settings
+/.classpath
+/.project
View
@@ -0,0 +1,114 @@
+FoBo-JQuery-Mobile
+=================
+
+This sub module provides JQuery-Mobile to the Fobo Module, but can also be used as-is (see below for setup information).
+For more information on how to use JQuery-Mobile in the FoBo module see the [FoBo - Lift Front-End Toolkit Module](https://github.com/karma4u101/FoBo).
+
+Contributions
+------
+Improvements, contributions and suggestions are welcome! Please see the [Contribution Document](https://github.com/karma4u101/FoBo/blob/master/CONTRIBUTING.md). You can also leave a issue report or drop a question/suggestion to my priv. e-mail or on [Lift's mailing list](http://groups.google.com/group/liftweb/)
+
+best regards
+Peter Petersson
+
+Update log
+----------
+
+For update history see the [History log](https://github.com/karma4u101/FoBo/tree/master/Font-Awesome#history-log) section
+
+**Latest Module Version:**
+- **2013-03-24** -- 0.1.0-SNAPSHOT
+
+**Latest Update:**
+- **2013-03-24** -- 0.1.0-SNAPSHOT Making FoBo-JQuery-Mobile a FoBo subproject.
+
+**Latest Stable Releases:**
+- None
+
+**Latest Snapshot Release:**
+-
+
+
+Integration into your project
+-------------------------------
+
+This module is used by the FoBo module to, via [FoBo](https://github.com/karma4u101/FoBo/blob/master/README.md) provide [JQuery-Mobile](http://jquerymobile.com/).
+
+However the FoBo-JQuery-Mobile module can be used separatly the only difference from using it from within the FoBo meta module is the usage of a slightly different package object name in Lift boot.
+
+The following describes how to set up the module in your project **as a separate module** (without using the [FoBo](https://github.com/karma4u101/FoBo/blob/master/README.md) meta module). For setup in FoBo see the FoBo documentation.
+
+For more information on how to use JQuery-Mobile see the [FoBo Demo](http://www.media4u101.se/fobo-lift-template-demo/) and [FoBo](https://github.com/karma4u101/FoBo/blob/master/README.md).
+
+
+### Dependency settings
+
+Put the following in your project build.sbt files lift libraryDependencies section
+
+ "net.liftmodules" %% "moduleName_x1.y1 % "x2.y2[.z2][-SNAPSHOT/rcx/mx]"
+
+or if you are using Maven
+
+ <dependency>
+ <groupId>net.liftmodules</groupId>
+ <artifactId>moduleName_x1.y1_a.b.c</artifactId>
+ <version>x2.y2[.z2][-SNAPSHOT/rcx/mx]</version>
+ </dependency>
+
+Where x1.y1 is Lift major and minor version numbers and a.b.c is Scala
+version number and x2.y2.[z2] is the module's major x2, minor y2 and
+eventual incremental numbers z2 followed by a eventual SNAPSHOT
+release candidate (rcX) or milestone (mX) version part.
+
+For example:
+
+ "net.liftmodules" %% "fobo-jquery-mobile_2.5 % "0.1.0-SNAPSHOT"
+ :
+ <dependency>
+ <groupId>net.liftmodules</groupId>
+ <artifactId>fobo-jquery-mobile_2.5_2.9.2</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+
+The example will include a module built for lift 2.5. If you are using maven observe that the artifact id also needs the Scala version.
+
+### Lift FoBo boot hooks
+
+ import net.liftmodules.FoBoJQM
+ :
+ FoBoJQM.InitParam.ToolKit=FoBoJQM.JQueryMobileXYZ
+ FoBoJQM.init()
+ (usage with FoBo is FoBo.InitParam.ToolKit=FoBo.JQueryMobileXYZ)
+
+### Lift FoBo Template hooks
+
+Css files
+
+- jquery.mobile.css
+- jquery.mobile.structure.css
+- jquery.mobile.theme.css (in jquery-mobile v1.1.0)
+
+Script files
+
+- jquery.mobile.js
+- jquery.mobile.themeswitcher.js
+
+ <link rel="stylesheet" type="text/css" href="/classpath/fobo/[css file name]">
+ <script type="text/javascript" src="/classpath/fobo/[script file name]"></script>
+
+For more information on how to use Knockout see [Knockout.](http://knockoutjs.com/)
+
+
+### History log
+----------------
+
+**Module Version history:**
+-
+
+**Updates history:**
+-
+
+**Snapshot Release history:**
+-
+
+
View
@@ -0,0 +1,144 @@
+name := "FoBo-JQuery-Mobile"
+
+organization := "net.liftmodules"
+
+version := "0.1.0-SNAPSHOT"
+
+name <<= (name, liftVName) { (n, v) => n + "_" + v }
+
+crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1")
+
+logLevel := Level.Info //Level.Info.Debug
+
+scalacOptions ++= Seq("-deprecation")
+
+EclipseKeys.withSource := true
+
+
+resolvers ++= Seq(
+ "Scala Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",
+ "Scala" at "https://oss.sonatype.org/content/groups/scala-tools/"
+)
+
+libraryDependencies <++= liftVersion { v =>
+ "net.liftweb" %% "lift-webkit" % v % "provided" ::
+ "net.liftweb" %% "lift-testkit" % v % "provided" ::
+ Nil
+}
+
+libraryDependencies <++= scalaVersion { sv =>
+ "ch.qos.logback" % "logback-classic" % "1.0.0" % "provided" ::
+ "log4j" % "log4j" % "1.2.16" % "provided" ::
+ (sv match {
+ case "2.10.0" | "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test"
+ case _ => "org.specs2" %% "specs2" % "1.12.3" % "test"
+ }) ::
+ (sv match {
+ case "2.10.0" | "2.9.2" => "org.scalacheck" %% "scalacheck" % "1.10.0" % "test"
+ case _ => "org.scalacheck" %% "scalacheck" % "1.10.0" % "test"
+ }) ::
+ Nil
+}
+
+
+//############################################################
+//#### THE BUILDINFO BUILD
+//## https://github.com/sbt/sbt-buildinfo
+//##
+//##
+//#############################################################
+
+//seq(buildInfoSettings: _*)
+
+//sourceGenerators in Compile <+= buildInfo
+
+//buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion)
+
+//buildInfoPackage := "net.liftmodules.FoBo.lib"
+
+
+//#########################################################################
+//#### THE LESS BUILD
+//##
+//## To simplify, the less build has been moved to the FoBo-Less project.
+//## Bootstrap css files, slightly modified to work in the FoBo environment,
+//## is built in the FoBo-Less project and then copied (already present) to
+//## there corresponding src/resources directories.
+//##
+//#########################################################################
+
+//Take a look att FoBo-Less and read the above.
+
+//################################################################
+//#### THE YUI COMPRESSION BUILD
+//## The yui js compression stuff dose currently not work so
+//## for now the last filter string in exludeFilter for js
+//## will exclude every .js file
+//################################################################
+seq(yuiSettings: _*)
+
+excludeFilter in (Compile, YuiCompressorKeys.jsResources) := "*-debug.js" | "*-min.js" | "*.js"
+
+excludeFilter in (Compile, YuiCompressorKeys.cssResources) := "*-debug.css" | "*-min.css"
+
+YuiCompressorKeys.minSuffix := "-min"
+
+//################################################################
+//#### Publish to Media4u101
+//##
+//##
+//##
+//################################################################
+credentials += Credentials(Path.userHome / ".sbt" / "liftmodules" /".credentials" )
+
+credentials += Credentials( file("/private/liftmodules/sonatype.credentials") )
+
+//credentials += Credentials(Path.userHome / ".sbt" / ".credentials" )
+//publishTo <<= version { v: String =>
+// val nexus = "http://www.media4u101.se:8081/nexus/"
+// if (v.trim.endsWith("SNAPSHOT"))
+// Some("snapshots" at nexus + "content/repositories/snapshots")
+// else
+// Some("releases" at nexus + "content/repositories/releases")
+// }
+
+publishTo <<= version { v: String =>
+ val sonatype = "https://oss.sonatype.org/"
+ if (v.trim.endsWith("SNAPSHOT"))
+ Some("snapshots" at sonatype + "content/repositories/snapshots")
+ else
+ Some("releases" at sonatype + "service/local/staging/deploy/maven2")
+ }
+
+publishMavenStyle := true
+
+publishArtifact in Test := false
+
+pomIncludeRepository := { x => false }
+
+pomExtra := (
+ <url>http://www.media4u101.se/fobo-lift-template-demo/</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://maven.apache.org/ref/2.1.0/maven-profile/license.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>git@github.com:karma4u101/FoBo.git</url>
+ <connection>scm:git:git@github.com:karma4u101/FoBo.git</connection>
+ </scm>
+ <developers>
+ <developer>
+ <id>karma4u101</id>
+ <name>Peter Petersson</name>
+ <url>http://www.media4u101.se</url>
+ </developer>
+ </developers>
+)
+
+
+
+
+
@@ -0,0 +1,2 @@
+Dual license, GPL or MIT
+See http://jquery.org/license/
Oops, something went wrong.

0 comments on commit 4df5ed6

Please sign in to comment.