adds a Gruntfile.js. By running grunt changes on less files are autom…

…atically compiled - CSS cleanup - fixes ToggleButton bug in search form for applications
cross-solution · Nov 23, 2017 · 110a855 · 110a855
1 parent 52cbfec
commit 110a855
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 13,910 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -0,0 +1,28 @@
+module.exports = function(grunt) {
+  require('jit-grunt')(grunt);
+
+  grunt.initConfig({
+    less: {
+      development: {
+        options: {
+          compress: true,
+          optimization: 2
+        },
+        files: {
+          "public/css/yawik.css": "less/yawik.less" // destination file and source file
+        }
+      }
+    },
+    watch: {
+      styles: {
+        files: ['less/**/*.less'], // which files to watch
+        tasks: ['less'],
+        options: {
+          nospawn: true
+        }
+      }
+    }
+  });
+
+  grunt.registerTask('default', ['less', 'watch']);
+};
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Demo
 ----
 
 http://yawik.org/demo/ (this demonstrates YAWIK as an applicant tracking system)
-http://jobs.yawik.org (this demonstrates YAWIK as a Jobportal) 
+http://jobs.yawik.org (YAWIK as a Jobportal with real job offers) 
 
 Who is using YAWIK?
 -------------------

diff --git a/less/general.less b/less/general.less
@@ -2,8 +2,8 @@
  * YAWIK
  *
  * @filesource
- * @copyright (c) 2013 Cross Solution (http://cross-solution.de)
- * @license   GPLv3
+ * @copyright (c) 2013-2017 Cross Solution (http://cross-solution.de)
+ * @license   MIT
  */
 
 

diff --git a/less/make-css.sh b/less/make-css.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-lessc  --yui-compress  yawik.less ../public/css/yawik.css
+lessc  yawik.less ../public/css/yawik.css
diff --git a/less/yawik.less b/less/yawik.less
@@ -2,8 +2,8 @@
  * YAWIK
  *
  * @filesource
- * @copyright (c) 2013 Cross Solution (http://cross-solution.de)
- * @license   GPLv3
+ * @copyright (c) 2013-2017 Cross Solution (http://cross-solution.de)
+ * @license   MIT
  */
 
 /**
@@ -24,7 +24,7 @@
 @yk-color-error-border: #953B39;
 
 @table-bg-header: #efefef;
-@table-border-color: #ddd;
+@table-border-color: #aaa;
 
 @panel-default-border: #ddd;
 
@@ -67,74 +67,74 @@
 @import "flag-icon-css/flag-icon-base.less";
 @import "flag-icon-css/flag-icon-list.less";
 
-@yawik-css-prefix:    yk;
+@yawik-css-prefix:                  yk;
 
 // the default values of the bootstrap global variables are defined in bootstrap/variables.less.
 // you can overwrite them here. 
 
-@navbar-height:             50px;
-@footer-height:			    25px;
+@navbar-height:                     50px;
+@footer-height:                     25px;
 
 @navbar-default-link-active-color:  @brand-primary;  
 @nav-pills-active-link-hover-color: @yk-color-orange;
 
 @nav-pills-active-link-hover-bg:    darken(@brand-primary, -80%);
 @input-border-focus:                darken(@brand-primary, -20%);
 
-@dropdown-link-active-bg: @yk-color-orange;
+@dropdown-link-active-bg:           @yk-color-orange;
 
 // Brand colors
 // -------------------------
-@brand-primary:         @yk-color-blue;
+@brand-primary:                     @yk-color-blue;
 
 // Links
 // -------------------------
-@link-color:            @brand-primary;
-@link-hover-color:      @yk-color-orange;
+@link-color:                        @brand-primary;
+@link-hover-color:                  @yk-color-orange;
 
 // Inverted navbar
 //
 // Reset inverted navbar basics
-@navbar-inverse-color:		            #FFFFFF;
-@navbar-inverse-bg:                         @brand-primary;
+@navbar-inverse-color:		        #FFFFFF;
+@navbar-inverse-bg:                 @brand-primary;
 
 // Inverted navbar links
-@navbar-inverse-link-color:                 #FFFFFF;
-@navbar-inverse-link-hover-color:           @link-hover-color;
-@navbar-inverse-link-hover-bg:              darken(@brand-primary, 5%);
+@navbar-inverse-link-color:         #FFFFFF;
+@navbar-inverse-link-hover-color:   @link-hover-color;
+@navbar-inverse-link-hover-bg:      darken(@brand-primary, 5%);
 
 
 // YAWIK Variables
-@colorError:               #B94A48;
-@colorErrorShadow:         #D59392;
-@backgroundFieldset:       @yk-color-background-fieldset;
+@colorError:                        #B94A48;
+@colorErrorShadow:                  #D59392;
+@backgroundFieldset:                @yk-color-background-fieldset;
 
 
-@font-size-h1: 26px;
-@font-size-h2: 24px;
-@font-size-h3: 22px;
-@font-size-h4: 20px;
-@font-size-h5: 18px;
-@font-size-h6: 16px;
+@font-size-h1:                      26px;
+@font-size-h2:                      24px;
+@font-size-h3:                      22px;
+@font-size-h4:                      20px;
+@font-size-h5:                      18px;
+@font-size-h6:                      16px;
 
 body {
      position: relative;
-     margin-top: 45px;
+     margin-top: calc(@navbar-height - 5px);
 }
 
 
 th {
-  background-color: @table-bg-header;
+    background-color: @table-bg-header;
 }
 
 #yk-topbar {
-  .navbar;
-  .navbar-inverse;
-  .navbar-fixed-top;
+    .navbar;
+    .navbar-inverse;
+    .navbar-fixed-top;
 }
 
 main {
-	margin-bottom: (@footer-height + 10px);
+	margin-bottom: calc(@footer-height + 10px);
 }
 
 /*
@@ -150,34 +150,14 @@ main {
 .yk-input-group {
 }
 
-/**
- * toolbar on the main section
- */
-.yk-toolbar {
-  margin: 0 0 8px;
-  padding: 0;
-  min-height: 0;
-
-  .cam-input-group {
-    max-width: 400px;
-    min-width: 250px;
-    float: left;
-  }
-  .cam-action-states {
-    max-width: 400px;
-    min-width: 100px;
-    margin-right: 4px;
-    float:left;
-  }
-}
 
 /**
  * footer on the page
  */
 #yk-footer {
-        .hidden-xs;
-        .navbar;
-        .navbar-fixed-bottom;
+    .hidden-xs;
+    .navbar;
+    .navbar-fixed-bottom;
 	height:	    @footer-height;
 	min-height: @footer-height;
 	max-height: @footer-height;
@@ -211,7 +191,7 @@ form .input-error input
 
 form .input-error input:focus {
 	border-color: @yk-color-error-border;
-        box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 6px @colorErrorShadow;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 6px @colorErrorShadow;
 }
 
 .form-inline fieldset .fieldset-content .controls-row {
@@ -228,61 +208,61 @@ fieldset fieldset a.remove-item {
 
 
 #params-search-wrapper {
-  .col-xs-6 {
-  padding-left: 0;
-  padding-right: 0;
-  }
+    .col-xs-6 {
+        padding-left: 0;
+        padding-right: 0;
+    }
 }
 
 
 .btn-group {
- .col-md-3,
- .col-md-6 {
-    padding-left: 0;
-    padding-right: 0;
- }
+    .col-md-3,
+    .col-md-6 {
+        padding-left: 0;
+        padding-right: 0;
+    }
 }
 
 /*
 * Add & remove buttons
 */
 .yk-form-add {
-  .btn;
-  .btn-default;
-  .pull-right;
+    .btn;
+    .btn-default;
+    .pull-right;
 }
 .yk-form-remove {
-  .btn;
-  .btn-default;
-  .pull-right;
+    .btn;
+    .btn-default;
+    .pull-right;
 }
 
 #attachments input {
-  border: none;
-  box-shadow: none;
-  padding: 0 12px;
+    border: none;
+    box-shadow: none;
+    padding: 0 12px;
 }
 
 #profiles {
-  margin-bottom:20px;
+    margin-bottom:20px;
 }
 
 /**
 * used in layout.phtml
 */
 .yk-notifications {
-  margin-top: 10px;
-  padding: 0 15px;
+    margin-top: 10px;
+    padding: 0 15px;
 }
 .yk-logo-list {
-  width: 100px;
-  height: 50px;
-  margin: 5px;
-  float: left;
+    width: 100px;
+    height: 50px;
+    margin: 5px;
+    float: left;
 }
 .yk-logo-sm {
-  max-height: 40px;
-  max-width: 80px;
+    max-height: 40px;
+    max-width: 80px;
 }
 
 // Login Box
@@ -326,7 +306,6 @@ table.assign-user-list tr {
 #yk-login,
 #wizardcontainer-jobs-form-categoriescontainer,
 #wizardcontainer-jobs-form-job {
-
     .pager {
         border-bottom-color: @yk-btn-primary-border;
         a {

diff --git a/module/Applications/view/applications/manage/index.phtml b/module/Applications/view/applications/manage/index.phtml
@@ -70,39 +70,6 @@ $this->headScript()->appendFile($this->basePath('Applications/js/applications.in
   </nav>
 <?php endif;?>
 
-<?php
-if (False):
-?>
-<div class="container col-md-12">
-<nav class="navbar yk-toolbar">
-    <form id="search-applications-form" class="form-inline" action="<?php echo $this->basePath('/de/applications')?>" method="get">
-      <div id="search-applications form-group has-feedback" class="row">
-        <input class="form-control" id="search-applications-input"
-               placeholder="<?php echo $this->translate('search applications')?> ..."
-               name="search"
-               type="text"
-               <?php if ($this->search): ?>value="<?php echo $this->search ?>" <?php endif ?>>
-
-        <input class="form-control" type="text" id="job-filteraa" name="job_title" placeholder="<?php echo $this->translate('Enter job title')?> ..."
-        <?php if ($this->job): ?> value="[<?php echo $this->job->applyId ?>] <?php echo $this->job->title ?>"<?php endif ?>>
-        <select class="form-control" name="status">
-<?php foreach ($this->applicationStates as $applicationStatus): ?>
-    <option <?php echo $applicationStatus=='all'?'class="yk-icon yk-icon-filter"':'';?>value="<?php echo $applicationStatus; ?>" <?php echo isset($this->applicationState)&&$this->applicationState==$applicationStatus?'selected="selected" ':''?>>
-    <?php echo $this->translate($applicationStatus); ?>
-    </option>
-<?php endforeach; ?>
-        </select>
-        <input id="job-filter-value" type="hidden" name="job" <?php if ($this->job):?> value="<?php echo $this->job->id ?>"<?php endif?>>
-        <button class="btn btn-primary" type="submit"><?php echo $this->translate('Search')?></button>
-        <a href="<?php echo $this->url('lang/applications', array(), array('query' => array('clear' => 1)), true) ?>"
-           class="btn btn-default"><?php echo $this->translate('Clear') ?></a>
-      </div>
-    </form>
-  </nav>
-</div>
-<?php
-endif;
-?>
 <div class="pagination-container" data-uri="<?php echo $this->url('lang/applications', array(),
                   array('query' => $this->params()->fromQuery()), true) ?>">
     <div class="pagination-content">

diff --git a/module/Core/config/module.config.php b/module/Core/config/module.config.php
@@ -347,7 +347,7 @@
     ),
     'view_helpers' => array(
         'invokables' => array(
-            'form_element' => 'Core\Form\View\Helper\FormElement',
+            'formElement' => 'Core\Form\View\Helper\FormElement',
             'formLabel'  => 'Core\Form\View\Helper\RequiredMarkInFormLabel',
             'form' => 'Core\Form\View\Helper\Form',
             'formSimple' => 'Core\Form\View\Helper\FormSimple',

diff --git a/module/Geo/test/GeoTest/Form/GeoSelectTest.php b/module/Geo/test/GeoTest/Form/GeoSelectTest.php
@@ -44,6 +44,7 @@ class GeoSelectTest extends \PHPUnit_Framework_TestCase
                         'data-placeholder' => 'Location',
                         'data-autoinit' => false,
                         'class' => 'geoselect',
+                         'data-clear-on-reset' => true
                     ]],
                     'count' => 1
                 ],

diff --git a/module/Orders b/module/Orders
diff --git a/package.json b/package.json
@@ -11,6 +11,10 @@
     "bootstrap3-dialog": "^1.35.3",
     "flag-icon-css": "^2.8.0",
     "font-awesome": "^4.7.0",
+    "grunt": "^1.0.1",
+    "grunt-contrib-less": "^1.4.1",
+    "grunt-contrib-watch": "^1.0.0",
+    "jit-grunt": "^0.10.0",
     "jquery": "^2.2.4",
     "less": "^2.7.2",
     "pnotify": "^3.0.0",