Skip to content

Commit

Permalink
Merge pull request #147 from helios-ag/readme_update
Browse files Browse the repository at this point in the history
readme small improvements, and newline chars at end of files
  • Loading branch information
helios-ag committed May 22, 2015
2 parents 1c1c0aa + 8b6d1f2 commit 6a04bbd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
9 changes: 4 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.idea
composer.lock
Tests/cache
Tests/log

composer.lock
Tests/cache
Tests/log

12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,7 @@ ivory_ck_editor:
configs:
default:
filebrowserBrowseRoute: elfinder
filebrowserBrowseRouteParameters:
instance: ckeditor
filebrowserBrowseRouteParameters: []
```

Expand All @@ -355,11 +354,10 @@ Note that instance name should be the same as configured in elfinder bundle
// applies to Ivory CKEditor Bundle
$form = $this->createFormBuilder()
->add('content', 'ckeditor', array(
'config' => array(
'filebrowser_image_browse_url' => array(
'route' => 'elfinder',
'route_parameters' => array('instance' => 'ckeditor'),
),
'config' => array(
'filebrowserBrowseRoute' => 'elfinder',
'filebrowserBrowseRouteParameters' => array('instance' => 'default')
),
),
))
->getForm()
Expand Down
3 changes: 2 additions & 1 deletion Resources/views/Elfinder/helper/assets_js.html.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script src="{{ prefix }}/jquery/jquery.js"></script>
<script src="{{ prefix }}/jquery-ui/jquery-ui.min.js"></script>
<script src="{{ prefix }}/elfinder/js/elfinder.min.js"></script>
<script src="{{ prefix }}/elfinder/js/i18n/elfinder.{{locale}}.js"></script>
<script src="{{ prefix }}/elfinder/js/i18n/elfinder.{{locale}}.js"></script>

0 comments on commit 6a04bbd

Please sign in to comment.