Merge pull request #136 from eea/develop

Jenkins pipeline
eea · Jan 26, 2018 · 3e02d97 · 3e02d97
2 parents 7354aeb + 8cb472e
commit 3e02d97
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 30 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -210,7 +210,7 @@ pipeline {
             if ( env.CHANGE_BRANCH != "develop" &&  !( env.CHANGE_BRANCH.startsWith("hotfix")) ) {
                 error "Pipeline aborted due to PR not made from develop or hotfix branch"
             }
-            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" eeacms/gitflow'''
+            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_NAME="$GIT_NAME" eeacms/gitflow'''
           }
         }
       }
@@ -225,8 +225,8 @@ pipeline {
       }
       steps {
         node(label: 'docker-1.13') {
-          withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'eea-jenkins', usernameVariable: 'EGGREPO_USERNAME', passwordVariable: 'EGGREPO_PASSWORD'],string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) {
-            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e EGGREPO_USERNAME="$EGGREPO_USERNAME" -e EGGREPO_PASSWORD="$EGGREPO_PASSWORD" -e GIT_NAME="$GIT_NAME" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_ORG="$GIT_ORG" -e GIT_TOKEN="$GITHUB_TOKEN" eeacms/gitflow'''
+          withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'eea-jenkins', usernameVariable: 'EGGREPO_USERNAME', passwordVariable: 'EGGREPO_PASSWORD'],string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),[$class: 'UsernamePasswordMultiBinding', credentialsId: 'pypi-jenkins', usernameVariable: 'PYPI_USERNAME', passwordVariable: 'PYPI_PASSWORD']]) {
+            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e EGGREPO_USERNAME="$EGGREPO_USERNAME" -e EGGREPO_PASSWORD="$EGGREPO_PASSWORD" -e GIT_NAME="$GIT_NAME"  -e PYPI_USERNAME="$PYPI_USERNAME"  -e PYPI_PASSWORD="$PYPI_PASSWORD" -e GIT_ORG="$GIT_ORG" -e GIT_TOKEN="$GITHUB_TOKEN" eeacms/gitflow'''
           }
         }
       }

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,8 +1,14 @@
 Changelog
 =========
 
-10.7.dev0 - (unreleased)
-------------------------
+10.8 - (2018-01-26)
+-------------------
+* Change: view.css css cleanup of empty selectors and removed
+  overflow from left-area and right-area
+  [ichim-david refs #91590]
+
+10.7 - (2017-12-12)
+-------------------
 * Change: Replace eeacms/zptlint with eeacms/plone-test:4 zptlint
   [avoinea refs #90415]
 * Bug fix: Fix JS Error for Text Widget with default value
@@ -944,3 +950,4 @@ Changelog
 1.0 (2009-10-30)
 ----------------
 * Initial release
+
diff --git a/eea/facetednavigation/browser/stylesheets/view.css b/eea/facetednavigation/browser/stylesheets/view.css
@@ -12,13 +12,8 @@
   width: auto;
 }
 
-.faceted-widget {
-}
-
 /* Areas
 */
-#top-area {
-}
 
 #center-and-left-area {
   float: left;
@@ -29,7 +24,6 @@
 #right-area {
   float: right;
   width: 25em;
-  overflow: hidden;
 }
 
 #center-area {
@@ -41,13 +35,6 @@
 #left-area {
   float: left;
   width: 25em;
-  overflow: hidden;
-}
-
-#center-top-area {
-}
-
-#center-bottom-area {
 }
 
 #bottom-area {
@@ -142,18 +129,16 @@
 }
 
 #faceted-form .ui-accordion .ui-accordion-content {
-  padding: 0px;
+  padding: 0;
   overflow: hidden;
-  border-width: 0;
-  border-style: none;
+  border: 0 none;
 }
 
 /* Inactive state
 */
 #faceted-form .ui-accordion .ui-state-default {
   border: none;
-  background: none;
-  background-color: #95b229;
+  background: #95b229 none;
   margin: 0 0.5em;
 }
 
@@ -171,8 +156,7 @@
 */
 #faceted-form .ui-accordion .ui-state-active {
   border: none;
-  background: none;
-  background-color: #e9efcd;
+  background: #e9efcd none;
   margin: 0 0.5em;
 }
 
@@ -197,9 +181,7 @@
 }
 
 .faceted-widget-loading {
-  background-image:url(../../++resource++faceted_images/ajax-loader-small.gif);
-  background-position:95% 1.5em;
-  background-repeat:no-repeat;
+  background: url(../../++resource++faceted_images/ajax-loader-small.gif) no-repeat 95% 1.5em;
 }
 
 /* Errors
@@ -226,7 +208,6 @@
   visibility: hidden;
 }
 
-
 .icon-faceted_settings:before {
   content: '\e812';
 }
diff --git a/eea/facetednavigation/ftests/plone4/01_enable_faceted_navigation.js b/eea/facetednavigation/ftests/plone4/01_enable_faceted_navigation.js
@@ -62,6 +62,11 @@ casper.test.begin('Faceted Navigation Enable', function(test) {
            test.assertExists("[name='form.button.save']");
    });
 
+   casper.wait(1000);
+   casper.then(function() {
+          this.captureSelector("screenshot_faceted.png", "html");
+    });
+
    casper.waitForSelector("[id='plone-contentmenu-actions-faceted.enable']",
        function success() {
            test.assertExists("[id='plone-contentmenu-actions-faceted.enable']");

diff --git a/eea/facetednavigation/version.txt b/eea/facetednavigation/version.txt
@@ -1 +1 @@
-10.7.dev0
+10.8