Improve Som Energia theme css

* Extract somenergia-theme/somenergia-theme.css style from somenergia-theme/css.php

* Added maintenance_style.css

* Remove old SomEnergia Theme

* Added pregenerated dockers

* Merge css in one file

* Create forms.css to lint

* Fix adjoining classes in the css

* Improve css

* Remove empty rules

* Fix all css errors

* Remove  tests that have language dependencies

* Fix theme css

.docker/apache/Dockerfile

@@ -1,34 +1,6 @@
-FROM php:7.0-apache
+FROM blackleg/elgg-apache
 MAINTAINER  Som Energia
 
-# Install dependencies
-RUN apt-get update && apt-get -y install git zlib1g-dev libpng-dev sendmail \ 
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Enable zip extension
-RUN docker-php-ext-install zip pdo pdo_mysql gd
-
-# Install composer
-RUN curl -sS https://getcomposer.org/installer -o composer-setup.php \
-     && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \ 
-     && composer self-update \ 
-     && composer global require "fxp/composer-asset-plugin:~1.1.4" \
-     && rm -rf composer-setup.php
-
-# Change listen port to 8000
-EXPOSE 8000
-RUN echo "Listen 8000" >> /etc/apache2/ports.conf
-RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
-COPY .docker/apache/default.conf /etc/apache2/sites-available/000-default-8000.conf
-RUN a2ensite 000-default-8000.conf
-
-# Enable mod rewrite
-RUN a2enmod rewrite
-
-# Data volume
-RUN mkdir -p /var/www/data && chown www-data:www-data /var/www/data && chmod g+w /var/www/data
-VOLUME ["/var/www/data"]
-
 # Add docker settings file
 COPY .docker/apache/settings.php /var/www/html/elgg-config/settings.php
 

.docker/cron/Dockerfile

@@ -1,19 +1,6 @@
-FROM debian:jessie
+FROM blackleg/elgg-cron
 MAINTAINER  Som Energia
 
-
-# Install dependencies
-RUN apt-get update && apt-get -y install cron libwww-perl \ 
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Create the log file to be able to run tail
-RUN touch /var/log/cron.log
-
 # Add crontab file in the cron directory
-ADD .docker/cron/crontab /etc/cron.d/elgg
-
-# Give execution rights on the cron job
+COPY .docker/cron/crontab /etc/cron.d/elgg
 RUN chmod 0644 /etc/cron.d/elgg
-
-# Run the command on container startup
-CMD cron && tail -f /var/log/cron.log

.test/activity.js

@@ -1,10 +1,8 @@
-casper.test.begin('Test Activity page', 4, function suite(test) {
+casper.test.begin('Test Activity page', 2, function suite(test) {
     casper.start("http://localhost:8000/activity", function () {
         test.assertHttpStatus(200);
-        test.assertTitle("All Site Activity : Docker Plataforma", "Docker Plataforma page title is the one expected");
 
         test.assertExists('div #login-dropdown a');
-        test.assertSelectorHasText('div #login-dropdown a', 'Log in');
 
     });
 

.test/file.js

@@ -0,0 +1,10 @@
+casper.test.begin('Test File page all', 2, function suite(test) {
+    casper.start("http://localhost:8000/file/all", function () {
+        test.assertHttpStatus(200);       
+        test.assertExists('div #login-dropdown a');
+    });
+
+    casper.run(function () {
+        test.done();
+    });
+});

.test/groups.js

@@ -1,11 +1,29 @@
-casper.test.begin('Test Groups all page', 4, function suite(test) {
+casper.test.begin('Test Groups page all', 2, function suite(test) {
     casper.start("http://localhost:8000/groups/all", function () {
-        test.assertHttpStatus(200);
-        test.assertTitle("All groups : Docker Plataforma", "Docker Plataforma page title is the one expected");
-
+        test.assertHttpStatus(200);       
         test.assertExists('div #login-dropdown a');
-        test.assertSelectorHasText('div #login-dropdown a', 'Log in');
+    });
 
+    casper.run(function () {
+        test.done();
+    });
+});
+
+casper.test.begin('Test Groups page all filter all', 2, function suite(test) {
+    casper.start("http://localhost:8000/groups/all?filter=all", function () {
+        test.assertHttpStatus(200);       
+        test.assertExists('div #login-dropdown a');
+    });
+
+    casper.run(function () {
+        test.done();
+    });
+});
+
+casper.test.begin('Test Groups page all filter all', 2, function suite(test) {
+    casper.start("http://localhost:8000/groups/all?filter=all", function () {
+        test.assertHttpStatus(200);       
+        test.assertExists('div #login-dropdown a');
     });
 
     casper.run(function () {

.test/home.js

@@ -1,10 +1,7 @@
-casper.test.begin('Test Home', 4, function suite(test) {
+casper.test.begin('Test Home', 2, function suite(test) {
     casper.start("http://localhost:8000", function () {
         test.assertHttpStatus(200);
-        test.assertTitle("Docker Plataforma", "Docker Plataforma page title is the one expected");
-
         test.assertExists('div #login-dropdown a');
-        test.assertSelectorHasText('div #login-dropdown a', 'Log in');
 
     });
 

.test/members.js

@@ -0,0 +1,55 @@
+casper.test.begin('Test Members page', 2, function suite(test) {
+    casper.start("http://localhost:8000/members", function () {
+        test.assertHttpStatus(200);
+        test.assertExists('div #login-dropdown a');
+    });
+
+    casper.run(function () {
+        test.done();
+    });
+});
+
+
+casper.test.begin('Test Members page newest', 2, function suite(test) {
+    casper.start("http://localhost:8000/members/newest", function () {
+        test.assertHttpStatus(200);
+        test.assertExists('div #login-dropdown a');
+    });
+
+    casper.run(function () {
+        test.done();
+    });
+});
+
+casper.test.begin('Test Members page alpha', 2, function suite(test) {
+    casper.start("http://localhost:8000/members/alpha", function () {
+        test.assertHttpStatus(200);
+        test.assertExists('div #login-dropdown a');
+    });
+
+    casper.run(function () {
+        test.done();
+    });
+});
+
+casper.test.begin('Test Members page popular', 2, function suite(test) {
+    casper.start("http://localhost:8000/members/popular", function () {
+        test.assertHttpStatus(200);
+        test.assertExists('div #login-dropdown a');
+    });
+
+    casper.run(function () {
+        test.done();
+    });
+});
+
+casper.test.begin('Test Members page online', 2, function suite(test) {
+    casper.start("http://localhost:8000/members/online", function () {
+        test.assertHttpStatus(200);
+        test.assertExists('div #login-dropdown a');
+    });
+
+    casper.run(function () {
+        test.done();
+    });
+});

.test/profile.js

@@ -1,10 +1,8 @@
-casper.test.begin('Test Profile page', 4, function suite(test) {
+casper.test.begin('Test Profile page', 2, function suite(test) {
     casper.start("http://localhost:8000/profile/admin", function () {
         test.assertHttpStatus(200);
-        test.assertTitle("Admin : Docker Plataforma", "Docker Plataforma page title is the one expected");
 
         test.assertExists('div #login-dropdown a');
-        test.assertSelectorHasText('div #login-dropdown a', 'Log in');
 
     });
 

Gruntfile.js

@@ -2,9 +2,35 @@ module.exports = function (grunt) {
 
     grunt.initConfig({
         csslint: {
+            options: {
+                    "order-alphabetical": false,
+                    "qualified-headings": false,
+                    "ids": false,
+                    "zero-units": 2,
+                    "adjoining-classes": 2,
+                    "unique-headings": false,
+                    "box-sizing": false,
+                    "floats": false,
+                    "important": false,
+                    "box-model": false,
+                    "font-sizes": false,
+                    "outline-none": false,
+                    "fallback-colors": false,
+                    "empty-rules": 2,
+                    "selector-newline": 2,
+                    "overqualified-elements": false,
+                    "universal-selector": 2,
+                    "duplicate-properties": 2,
+                    "gradients": false,
+                    "compatible-vendor-prefixes": 2,
+                    "text-indent": false,
+                    "known-properties": false
+                },
             somenergiatheme: {
                 src: ['mod/somenergia-theme/views/default/walled_garden.css',
-                    'mod/somenergia-theme/views/default/elements/*.css'],
+                    'mod/somenergia-theme/views/default/elements/*.css',
+                    'mod/somenergia-theme/views/default/somenergia-theme/somenergia-theme.css',
+                    'mod/somenergia-theme/views/default/maintenance_style.css'],
                 nonnull: true
             }
         },

docker-compose.yml

@@ -8,8 +8,6 @@ services:
       - 3336:3306
     volumes:
       - '../plataforma_mysql_data:/var/lib/mysql'
-    ulimits:
-      cpu: 2
   email:
     image: tophfr/mailcatcher:0.6.5_2
     ports:
@@ -29,8 +27,6 @@ services:
     depends_on:
       - mysql
       - email
-    ulimits:
-      cpu: 2
     volumes:
       - '../plataforma_elgg_data:/var/www/data'
       - './mod/export_users_csv:/var/www/html/mod/export_users_csv'