Merge pull request #2 from TheCoder4eu/master

Update master to 1.1.0

README.md

@@ -16,26 +16,25 @@ To learn more about the framework, take a look at  [BootsFaces.net](http://www.b
 
 The source for our page can be found on GitHub. If you want to have a deeper look on how to use the library or found a mistake, visit the [Showcase Project](https://github.com/TheCoder4eu/BootsFacesWeb) or the [Examples Project](https://github.com/TheCoder4eu/BootsFaces-examples).
 
-
-###Getting started
+### Getting started
 To get up and running quickly, have a look at the [Quick Start](http://www.bootsfaces.net/quick-start.jsf).
 
-
-###Maven
+### Maven
 
     <dependency>
         <groupId>net.bootsfaces</groupId>
         <artifactId>bootsfaces</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
     </dependency>
 
-###Gradle
+### Gradle
+
+    compile 'net.bootsfaces:bootsfaces:1.1.0'
 
-    compile 'net.bootsfaces:bootsfaces:1.0.0'
+### Development Snapshots
 
-###Development Snapshots
 See [this issue](https://github.com/TheCoder4eu/BootsFaces-OSP/issues/369) for instructions on how to get a current developer snapshot via Maven.  
 There's also a [Snapshot Showcase](http://www3.bootsfaces.net/Showcase/) with the newest upstream changes.
 
-###Contributing
+### Contributing
 If you want to get your feet wet yourself, we suggest you to take a look at our [cheat-sheet](cheat-sheet.md) and the [contribution guidelines](CONTRIBUTING.md).

build.gradle

@@ -20,7 +20,11 @@
 Properties props = new Properties()
 props.load(new FileInputStream("${projectDir}/build.properties"))
 ext.BootsFacesVersion = props['VERSION']
-ext.BootsFacesReleaseStatus = props['RELEASE-STATUS'] //SNAPSHOT or RELEASE
+ext.BootsFacesReleaseStatus = props['RELEASE-STATUS'] //SNAPSHOT or RCn or betaN or empty for RELEASE
+def pomVersion = BootsFacesVersion+'-SNAPSHOT'
+if(BootsFacesReleaseStatus==null||BootsFacesReleaseStatus=='') { pomVersion=BootsFacesVersion }
+else if(BootsFacesReleaseStatus.startsWith("RC")||BootsFacesReleaseStatus.startsWith("beta")) { pomVersion=BootsFacesVersion+'-'+BootsFacesReleaseStatus }
+ext.pomVersion=pomVersion
 //Bootstrap
 ext.BootstrapVersion = props['bootstrap.version']
 //PatternFly
@@ -64,6 +68,9 @@ task showConfig {
       println "Main Configurations:"
       println "--------------------"
       println "BootsFacesVersion="+BootsFacesVersion
+      println "BootsFacesReleaseStatus="+BootsFacesReleaseStatus
+      println "pomVersion="+pomVersion
+      println "--------------------"
       println "BootstrapVersion="+BootstrapVersion
       println "BootswatchFullVersion="+BootswatchFullVersion
       println "PatternFlyVersion="+PatternFlyVersion
@@ -89,7 +96,7 @@ showConfig.doFirst {
   new File( configClassFile ).write( configClass, 'UTF-8' )
 
   //Patches version in pom file.
-  def pomVersion = BootsFacesReleaseStatus == 'SNAPSHOT' ? BootsFacesVersion+'-SNAPSHOT' : BootsFacesVersion
+  //def pomVersion = BootsFacesReleaseStatus == 'SNAPSHOT' ? BootsFacesVersion+'-SNAPSHOT' : BootsFacesVersion
   String projectPomText = new File( 'pom.xml' ).getText( 'UTF-8' )
   projectPomText=(projectPomText =~ /<version>[^<]+<\/version>/).replaceFirst('<version>'+pomVersion+'</version>')
   new File( 'pom.xml' ).write( projectPomText, 'UTF-8' )

build.properties

@@ -24,8 +24,8 @@
 # rather than c:\dir1\dir2 to refer to paths -- Java thinks a single backslash
 # is an escape character followed by a control character.
 #########################################################################################################
-VERSION=1.1.0
-# RELEASE-STATUS - SNAPSHOT (default)
+VERSION=1.1.1
+# RELEASE-STATUS - SNAPSHOT , beta1, rc1 ...
 # or don't remove the property but just leave it blank for a Final RELEASE :
 # RELEASE-STATUS=
 RELEASE-STATUS=SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Feb 16 21:17:28 CET 2017
+#Fri Apr 28 18:40:33 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip

gradleResources/compileLess/build.gradle

@@ -23,8 +23,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.bertramlabs.plugins:asset-pipeline-gradle:2.13.1'
-        classpath 'com.bertramlabs.plugins:less-asset-pipeline:2.13.1'
+        classpath 'com.bertramlabs.plugins:asset-pipeline-gradle:2.14.0'
+        classpath 'com.bertramlabs.plugins:less-asset-pipeline:2.14.0'
     }
 }
 
@@ -52,6 +52,10 @@ assets {
 
 assetCompile.dependsOn assetClean
 
+
+/*
+ * Dynamic tasks to copy files to the process directory
+ */
 themes.each {
     //create a dynamic task for each theme (in the config phase)
     def themeName ->
@@ -80,7 +84,7 @@ themes.each {
     }
 }
 
-task copyBootswatchLess4Themes (dependsOn: ['cloneDefaultLess4Themes',tasks.matching { Task task -> task.name.startsWith("copyBootswatchTheme2")}]) {
+task copyBootswatchLess4Themes (dependsOn: ['cloneDefaultLess4Themes',tasks.matching { Task task -> task.name.startsWith("copyBootswatchTheme2")},'copyBootswatchLessCustomizations']) {
     description 'BootsFaces task: copies the Bootswatch less files to the process folder for all the included Themes.'
     println "Task copyBootswatchLess4Themes"
 }
@@ -92,6 +96,12 @@ task cloneDefaultLess4Themes (dependsOn: [tasks.matching { Task task -> task.nam
 }
 copyBootswatchLess4Themes.mustRunAfter cloneDefaultLess4Themes
 
+//Copy the per-Theme Customizations
+task copyBootswatchLessCustomizations(type: Copy) {
+  	description 'BootsFaces task: copies the theme Customizations files to the process folder.'
+  	from staticResourcesDir+'/less/bw'
+  	into "${buildDir}/process/less"
+}
 
 /*
  * Tasks to copy files to the process directory

gradleResources/staticResources/css/bsf.css

@@ -26,6 +26,14 @@
     border-width: 1px 0 0;
 }
 
+/* Horizontal Forms
+.row .form-group {
+    margin-bottom: 10px;
+} */
+
+/* Inline Forms */
+.form-inline label, input { margin-right: 10px; }
+
 /* navCommandLink */
 .commandLink {
   cursor: pointer;
@@ -64,6 +72,8 @@ div > .ui-datepicker-trigger {
 .row .slider2-vertical { padding-bottom: 5px; margin-left: 0px;}
 .slider2-vertical p { font-weight: bold; margin: 0px; text-align: center;}
 .slider2 .tooltip-inner { width: auto !important; }
+.slider-handle.md {position: absolute; top: -2px; width: 24px; height: 24px; border-radius: 50%;}
+.slider-handle.lg {position: absolute; top: -4px; width: 28px; height: 28px; border-radius: 50%;}
 
 @media (min-width: 992px) { .slider2 .col-md-1 { width: 6%; } }
 @media (min-width: 1200px) { .slider2 .col-lg-1 { width: 5%; } }
@@ -411,4 +421,14 @@ a.panel-title-link {
 
 .form-inline .form-control.datatable-filter-field {
 	width: 100%;
-}
+}
+
+@font-face {
+	font-family: 'Glyphicons Halflings';
+	src: url("#{resource['fonts/glyphicons-halflings-regular.eot']}");
+	src: url("#{resource['fonts/glyphicons-halflings-regular.eot']}?#iefix") format('embedded-opentype'),
+		url("#{resource['fonts/glyphicons-halflings-regular.woff2']}") format('woff2'),
+		url("#{resource['fonts/glyphicons-halflings-regular.woff']}") format('woff'),
+		url("#{resource['fonts/glyphicons-halflings-regular.ttf']}") format('truetype'),
+		url("#{resource['fonts/glyphicons-halflings-regular.svg']}#glyphicons_halflingsregular") format('svg');
+}