Skip to content

Commit

Permalink
Update the admin interface and demo site generator
Browse files Browse the repository at this point in the history
Update the admin interface to feature a fully responsive, fully retina, cleaned up look and feel based on Bootstrap 3. Simultaniously updated the generated demo site to be more in line with what we use as a starting point for our websites.

While this commit is squashed under my name, this is the result of the hard work by too many people to mention by name.
  • Loading branch information
Roderik van der Veer committed Apr 3, 2015
1 parent 19ee146 commit f986ee4
Show file tree
Hide file tree
Showing 2,222 changed files with 262,338 additions and 56,395 deletions.
7 changes: 4 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ root = true

; Unix-style newlines
[*]
end_of_line = LF

[*.php]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ composer.phar
autoload.php
/vendor/
.idea
npm-debug.log
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
language: php

sudo: false

cache:
directories:
- $HOME/.composer/cache
Expand Down Expand Up @@ -31,7 +33,7 @@ before_script:
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;'
- sudo locale-gen nl_BE.UTF-8 && sudo update-locale
# - sudo locale-gen nl_BE.UTF-8 && sudo update-locale
- composer require symfony/symfony:${SYMFONY_VERSION}
- wget https://phar.phpunit.de/phpunit.phar
- wget https://scrutinizer-ci.com/ocular.phar
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The Kunstmaan Bundles CMS is an advanced yet user-friendly content management sy

Please refer to the documentation at [http://bundles.kunstmaan.be/getting-started](http://bundles.kunstmaan.be/getting-started) to get your CMS up and running.

![Screenshot](http://bundles.kunstmaan.be/uploads/media/521f4ef030de9.png?7dd5040)
![Screenshot](http://bundles.kunstmaan.be/uploads/media/5506eb367adee.png?falcon9ef16fd)

### Browser support

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"guzzle/guzzle": "3.8.*",
"white-october/pagerfanta-bundle": "1.0.*",
"phpoffice/phpexcel": "1.8.*",
"alchemy/google-plus-api-client": "~0.6.5",
"kunstmaan/google-api-custom": "~1.0.0",
"ddeboer/data-import-bundle": "0.1.*",
"gedmo/doctrine-extensions": "2.3.*",
"lunetics/locale-bundle": "*",
Expand Down
3 changes: 3 additions & 0 deletions src/Kunstmaan/AdminBundle/.bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "Resources/ui/vendor_bower/"
}
2 changes: 1 addition & 1 deletion src/Kunstmaan/AdminBundle/Form/GroupType.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'expanded' => false,
'required' => true,
'attr' => array(
'class' => 'chzn-select',
'class' => 'js-advanced-select form-control advanced-select',
'data-placeholder' => 'Choose the roles...'
),
)
Expand Down
2 changes: 1 addition & 1 deletion src/Kunstmaan/AdminBundle/Form/UserType.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'expanded' => false,
'required' => false,
'attr' => array(
'class' => 'chzn-select',
'class' => 'js-advanced-select form-control advanced-select',
'data-placeholder' => 'Choose the permission groups...'
)
)
Expand Down
27 changes: 27 additions & 0 deletions src/Kunstmaan/AdminBundle/Form/WysiwygType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

namespace Kunstmaan\AdminBundle\Form;

use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolverInterface;

/**
* This class represents the type for the TextFormWysiwygSubmissionField
*/
class WysiwygType extends AbstractType
{
public function getParent()
{
return 'textarea';
}

/**
* @return string
*/
public function getName()
{
// return 'kunstmaan_formbundle_Wysiwygformsubmissiontype';
return 'wysiwyg';
}
}
1 change: 1 addition & 0 deletions src/Kunstmaan/AdminBundle/Helper/Menu/MenuBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ public function getLowestTopChild()
{
$current = $this->getCurrent();
while (!is_null($current)) {

if ($current instanceof TopMenuItem) {
return $current;
}
Expand Down
7 changes: 6 additions & 1 deletion src/Kunstmaan/AdminBundle/Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,9 @@ services:
arguments: ["%kunstmaan_admin.session_security.ip_check%", "%kunstmaan_admin.session_security.user_agent_check%", "@logger"]
tags:
- { name: kernel.event_listener, event: kernel.request, method: onKernelRequest }
- { name: kernel.event_listener, event: kernel.response, method: onKernelResponse, priority: -1000 }
- { name: kernel.event_listener, event: kernel.response, method: onKernelResponse, priority: -1000 }

kunstmaan_form.type.wysiwyg:
class: Kunstmaan\AdminBundle\Form\WysiwygType
tags:
- { name: form.type, alias: wysiwyg }
Loading

0 comments on commit f986ee4

Please sign in to comment.