Add tinymce

This commit is contained in:
Nicolas Le Goff
2013-08-13 03:03:44 +02:00
parent 01602a49f1
commit d46583f824
4 changed files with 18 additions and 4 deletions

View File

@@ -11,7 +11,7 @@ before_script:
- node --version - node --version
- npm --version - npm --version
- npm install - npm install
- npm install grunt-cli -g - npm install grunt-cli jake -g
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;' - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then pecl install redis; fi;' - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then pecl install redis; fi;'

View File

@@ -22,7 +22,8 @@ module.exports = function(grunt) {
components: { components: {
"jquery.ui": ["npm", {"grunt": "build"}], "jquery.ui": ["npm", {"grunt": "build"}],
"bootstrap": ["npm", {"make": "bootstrap"}], "bootstrap": ["npm", {"make": "bootstrap"}],
"jquery-mobile": ["npm", {"make": "all"}] "jquery-mobile": ["npm", {"make": "all"}],
"tinymce": ["npm", "jake"]
} }
} }
} }
@@ -223,6 +224,18 @@ module.exports = function(grunt) {
"dest": "www/assets/swfobject", "dest": "www/assets/swfobject",
"flatten": true "flatten": true
}, },
"tinymce": {
"expand": true,
"cwd": "assets/tinymce/js/tinymce",
"src": [
"plugins/**",
"skins/**",
"themes/**",
"tinymce.js",
"license.txt"
],
"dest": "www/assets/tinymce"
},
"underscore": { "underscore": {
"expand": true, "expand": true,
"src": [ "src": [

View File

@@ -25,6 +25,7 @@
"bootstrap-multiselect": "https://github.com/davidstutz/bootstrap-multiselect.git", "bootstrap-multiselect": "https://github.com/davidstutz/bootstrap-multiselect.git",
"zxcvbn" : "https://github.com/lowe/zxcvbn.git", "zxcvbn" : "https://github.com/lowe/zxcvbn.git",
"geonames-server-jquery-plugin" : "~0.2", "geonames-server-jquery-plugin" : "~0.2",
"swfobject" : "latest" "swfobject" : "latest",
"tinymce" : "~4.0"
} }
} }

View File

@@ -15,7 +15,7 @@
{% block javascript %} {% block javascript %}
{% include "common/templates.html.twig" %} {% include "common/templates.html.twig" %}
{# note: Tinymce must be include here without minify else URL resolution for tinymce plugins will fail #} {# note: Tinymce must be include here without minify else URL resolution for tinymce plugins will fail #}
<script type="text/javascript" src="/include/tinymce/js/tinymce/tinymce.min.js"></script> <script type="text/javascript" src="/assets/tinymce/tinymce.js"></script>
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'admin' }) }}"></script> <script type="text/javascript" src="{{ path('minifier', { 'g' : 'admin' }) }}"></script>
<script type="text/javascript"> <script type="text/javascript">
var p4 = {users:{sel:[]}}; var p4 = {users:{sel:[]}};