瀏覽代碼

http => https, reorder the documentation

Thomas Rabaix 10 年之前
父節點
當前提交
0a3a7adfc9

+ 1 - 1
.travis.yml

@@ -35,4 +35,4 @@ before_script:
 script: make test
 
 notifications:
-    webhooks: http://sonata-project.org/bundles/admin/master/travis
+    webhooks: https://sonata-project.org/bundles/admin/master/travis

+ 1 - 1
CHANGELOG.md

@@ -204,7 +204,7 @@ CHANGELOG
 * [BC BREAK] Introduce Block Into the Admin Bundle
     * The AdminBundle has now a dependency to BlockBundle : http://github.com/sonata-project/SonataBlockBundle
     * The dashboard list is now a block, so it can be removed from the sonata_admin configuration.
-    * More blocks can be created please follow the instruction here : http://sonata-project.org/bundles/block/master/doc/reference/your_first_block.html
+    * More blocks can be created please follow the instruction here : https://sonata-project.org/bundles/block/master/doc/reference/your_first_block.html
 
 * [BC BREAK] New configuration format for the dashboard section.
 

+ 1 - 1
CONTRIBUTING.md

@@ -4,7 +4,7 @@ Sonata respects the symfony’s conventions about contributing to the code. So b
 
 If you happen to find a bug, we kindly request you to report it. However, before submitting it, please:
 
-  * Check the [project documentation available online](http://sonata-project.org/bundles/)
+  * Check the [project documentation available online](https://sonata-project.org/bundles/)
 
 Then, if it appears that it’s a real bug, you may report it using Github by following these 3 points:
 

+ 1 - 1
DependencyInjection/SonataAdminExtension.php

@@ -257,6 +257,6 @@ BOOM
      */
     public function getNamespace()
     {
-        return 'http://sonata-project.org/schema/dic/admin';
+        return 'https://sonata-project.org/schema/dic/admin';
     }
 }

+ 6 - 6
README.md

@@ -6,13 +6,13 @@ SonataAdminBundle - The missing Symfony2 Admin Generator
 Demo
 ----
 
-The demo website can be found in http://demo.sonata-project.org/admin/dashboard    
+The demo website can be found in http://demo.sonata-project.org/admin/dashboard
 **Username and password is:** ```admin```
 
 Documentation
 ------------
 
-The online documentation of the bundle is in http://sonata-project.org/bundles/admin
+The online documentation of the bundle is in https://sonata-project.org/bundles/admin
 
 For contribution to the documentation you can find it on [Resources/doc](https://github.com/sonata-project/SonataAdminBundle/tree/master/Resources/doc).
 
@@ -22,13 +22,13 @@ and some content might be broken or hidden, make sure to read raw files.
 **Warning**: The bundle has been split into 5 bundles :
 
 * SonataAdminBundle : the current one, contains core libraries and services
-* [SonataDoctrineORMAdminBundle](https://github.com/sonata-project/SonataDoctrineORMAdminBundle) 
+* [SonataDoctrineORMAdminBundle](https://github.com/sonata-project/SonataDoctrineORMAdminBundle)
 : Integrates the admin bundle into with the Doctrine ORM project
-* [SonataDoctrineMongoDBAdminBundle](https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle) 
+* [SonataDoctrineMongoDBAdminBundle](https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle)
 : Integrates the admin bundle into with MongoDB (early stage)
-* [SonataDoctrinePhpcrAdminBundle](https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle) 
+* [SonataDoctrinePhpcrAdminBundle](https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle)
 : Integrates the admin bundle into with PHPCR (early stage)
-* [SonataPropelAdminBundle](https://github.com/sonata-project/SonataPropelAdminBundle) 
+* [SonataPropelAdminBundle](https://github.com/sonata-project/SonataPropelAdminBundle)
 : Integrates the admin bundle into with Propel (early stage)
 
 **Google Groups**: For questions and proposals you can post on this google groups

Resources/doc/reference/knp_menu.rst → Resources/doc/cookbook/recipe_knp_menu.rst


Resources/doc/reference/select2.rst → Resources/doc/cookbook/recipe_select2.rst


+ 10 - 10
Resources/doc/cookbook/recipe_sortable_listing.rst

@@ -6,8 +6,8 @@ This is a full working example of how to implement a sortable feature in your So
 Background
 ----------
 
-A sortable behavior is already available for one-to-many relationships (http://sonata-project.org/bundles/doctrine-orm-admin/master/doc/reference/form_field_definition.html#advanced-usage-one-to-many). 
-However there is no packaged solution to have some up and down arrows to sort 
+A sortable behavior is already available for one-to-many relationships (https://sonata-project.org/bundles/doctrine-orm-admin/master/doc/reference/form_field_definition.html#advanced-usage-one-to-many).
+However there is no packaged solution to have some up and down arrows to sort
 your records such as showed in the following screen
 
 .. figure:: ../images/admin_sortable_listing.png
@@ -38,7 +38,7 @@ First of all we are going to add a position field in our ``Client`` entity.
      */
     private $position;
 
-Then we need to inject the Sortable listener. If you only have the Gedmo bundle enabled, 
+Then we need to inject the Sortable listener. If you only have the Gedmo bundle enabled,
 add the listener to your config.yml
 
 .. code-block:: yaml
@@ -50,8 +50,8 @@ add the listener to your config.yml
                 - { name: doctrine.event_subscriber, connection: default }
             calls:
                 - [ setAnnotationReader, [ @annotation_reader ] ]
-            
-If you have the ``stof/doctrine-extensions-bundle``, you only need to enable the sortable 
+
+If you have the ``stof/doctrine-extensions-bundle``, you only need to enable the sortable
 feature in your config.yml such as
 
 .. code-block:: yaml
@@ -104,9 +104,9 @@ Now you can update your ``services.yml`` to use the handler provider by the pixS
 	            - [ setTranslationDomain, [AcmeDemoBundle]]
 
 
-Last tricky part, in order to get the last position available in our twig template 
-we inject the position service into our admin class, define a public variable ``$last_position`` 
-and retrieve the value from our service in the ``configureListFields`` method. We 
+Last tricky part, in order to get the last position available in our twig template
+we inject the position service into our admin class, define a public variable ``$last_position``
+and retrieve the value from our service in the ``configureListFields`` method. We
 also define the sort by field to be position:
 
 .. code-block:: php
@@ -122,7 +122,7 @@ also define the sort by field to be position:
     {
         $this->positionService = $positionHandler;
     }
-    
+
     protected $datagridValues = array(
         '_page' => 1,
         '_sort_order' => 'ASC',
@@ -145,7 +145,7 @@ also define the sort by field to be position:
 And in  the services.yml add the following call
 
 .. code-block:: yaml
-    
+
 	- [ setPositionService, [@pix_sortable_behavior.position]]
 
 

+ 16 - 8
Resources/doc/index.rst

@@ -24,9 +24,6 @@ Reference Guide
    reference/architecture
    reference/dashboard
    reference/search
-   reference/select2
-   reference/knp_menu
-   reference/routing
    reference/action_list
    reference/action_create_edit
    reference/action_show
@@ -36,17 +33,26 @@ Reference Guide
    reference/form_types
    reference/form_help_message
    reference/field_types
-   reference/conditional_validation
-   reference/templates
    reference/batch_actions
+   reference/console
+   reference/troubleshooting
+
+Advanced Options
+----------------
+
+.. toctree::
+   :maxdepth: 1
+   :numbered:
+
+   reference/routing
    reference/translation
+   reference/conditional_validation
+   reference/templates
    reference/security
    reference/extensions
    reference/events
-   reference/advanced
-   reference/console
+   reference/advanced_configuration
    reference/preview_mode
-   reference/troubleshooting
 
 Cookbook
 --------
@@ -55,6 +61,8 @@ Cookbook
    :maxdepth: 1
    :numbered:
 
+   cookbook/recipe_select2
+   cookbook/recipe_knp_menu
    cookbook/recipe_file_uploads
    cookbook/recipe_image_previews
    cookbook/recipe_row_templates

+ 12 - 12
Resources/doc/reference/action_list.rst

@@ -154,7 +154,7 @@ Available types and associated options
 |           | hide_protocol  | Hide http:// or https:// (default false)                              |
 +-----------+----------------+-----------------------------------------------------------------------+
 
-If you have the SonataDoctrineORMAdminBundle installed, you have access to more field types, see `SonataDoctrineORMAdminBundle Documentation <http://sonata-project.org/bundles/doctrine-orm-admin/master/doc/reference/list_field_definition.html>`_.
+If you have the SonataDoctrineORMAdminBundle installed, you have access to more field types, see `SonataDoctrineORMAdminBundle Documentation <https://sonata-project.org/bundles/doctrine-orm-admin/master/doc/reference/list_field_definition.html>`_.
 
 Customizing the query used to generate the list
 -----------------------------------------------
@@ -284,7 +284,7 @@ A filter has a ``value`` and an optional ``type``. If no ``type`` is given the d
     protected $datagridValues = array(
         '_page' => 1,
         '_sort_order' => 'ASC',
-        '_sort_by' => 'id', 
+        '_sort_by' => 'id',
         'foo' => array('value' => 'bar')
     );
 
@@ -311,7 +311,7 @@ This is an example using these constants for an ``boolean`` type:
     use Sonata\UserBundle\Admin\Model\UserAdmin as SonataUserAdmin;
     use SonataCoreBundle/blob/master/Form/Type/EqualType.php;
     use SonataCoreBundle/blob/master/Form/Type/BooleanType;
-    
+
     class UserAdmin extends SonataUserAdmin
     {
         protected $datagridValues = array(
@@ -331,14 +331,14 @@ Please note that setting a ``false`` value on a the ``boolean`` type will not wo
         const TYPE_YES = 1;
         const TYPE_NO = 2;
     }
-    
+
 Default filters can also be added to the datagrid values by overriding the ``getFilterParameters`` method.
 
 .. code-block:: php
 
     use SonataCoreBundle/blob/master/Form/Type/EqualType.php;
     use SonataCoreBundle/blob/master/Form/Type/BooleanType;
-    
+
     class UserAdmin extends SonataUserAdmin
     {
         public function getFilterParameters()
@@ -349,7 +349,7 @@ Default filters can also be added to the datagrid values by overriding the ``get
                         'value' => BooleanType::TYPE_YES
                     )
                 ), $this->datagridValues);
-    
+
             return parent::getFilterParameters();
         }
     }
@@ -365,7 +365,7 @@ This approach is useful when you need to create dynamic filters.
             // Assuming security context injected
             if (!$this->securityContext->isGranted('ROLE_ADMIN')) {
                 $user = $this->securityContext->getToken()->getUser();
-                
+
                 $this->datagridValues = array_merge(array(
                         'author' => array (
                             'type'  => EqualType::TYPE_IS_EQUAL,
@@ -373,7 +373,7 @@ This approach is useful when you need to create dynamic filters.
                         )
                     ), $this->datagridValues);
             }
-            
+
             return parent::getFilterParameters();
         }
     }
@@ -389,7 +389,7 @@ If you have the **SonataDoctrineORMAdminBundle** installed you can use the ``doc
 
     use Sonata\UserBundle\Admin\Model\UserAdmin as SonataUserAdmin;
     use Sonata\AdminBundle\Datagrid\DatagridMapper;
-    
+
     class UserAdmin extends SonataUserAdmin
     {
         protected function configureDatagridFilters(DatagridMapper $datagridMapper)
@@ -400,20 +400,20 @@ If you have the **SonataDoctrineORMAdminBundle** installed you can use the ``doc
                     'field_type' => 'text'
                 ));
         }
-     
+
         public function getFullTextFilter($queryBuilder, $alias, $field, $value)
         {
             if (!$value['value']) {
                 return;
             }
-     
+
             // Use `andWhere` instead of `where` to prevent overriding existing `where` conditions
             $queryBuilder->andWhere($queryBuilder->expr()->orX(
                 $queryBuilder->expr()->like($alias.'.username', $queryBuilder->expr()->literal('%' . $value['value'] . '%')),
                 $queryBuilder->expr()->like($alias.'.firstName', $queryBuilder->expr()->literal('%' . $value['value'] . '%')),
                 $queryBuilder->expr()->like($alias.'.lastName', $queryBuilder->expr()->literal('%' . $value['value'] . '%'))
             ));
-     
+
             return true;
         }
     }

Resources/doc/reference/advanced.rst → Resources/doc/reference/advanced_configuration.rst


+ 84 - 62
Resources/doc/reference/configuration.rst

@@ -1,5 +1,5 @@
-Configuration // Warning: this doc page is not up to date and will be removed soon.
-===================================================================================
+Configuration
+=============
 
 .. note::
     This page will be removed soon, as it's content is being improved and moved to
@@ -52,17 +52,18 @@ Full Configuration Options
                     - OPERATOR
                     - MASTER
                     - OWNER
-                acl_user_manager:     ~         # Name of the user manager service used to retrieve ACL users
-            title:                Sonata Admin
+                acl_user_manager:     null
+            title:                'Sonata Admin'
             title_logo:           bundles/sonataadmin/logo_title.png
             options:
-                html5_validate:                         true      # use html5 validation
-                confirm_exit:                           true      # enabled confirmation when quitting with unsaved changes
-                use_select2:                            true      # enable select2
-                use_icheck:                             true      # enable iCheck
-                pager_links:                            ~         # pager max links to display
-                dropdown_number_groups_per_colums:      2         # max items per column in dropdown menu (add button in top nav)
-                title_mode:           'both'                      # 'both', 'single_text' or 'single_image'
+                html5_validate:       true
+                confirm_exit:         true
+                use_select2:          true
+                use_icheck:           true
+                pager_links:          null
+                form_type:            standard
+                dropdown_number_groups_per_colums:  2
+                title_mode:           ~ # One of "single_text"; "single_image"; "both"
             dashboard:
                 groups:
 
@@ -70,78 +71,99 @@ Full Configuration Options
                     id:
                         label:                ~
                         label_catalogue:      ~
-                        items:                []
+                        icon:                 '<i class="fa fa-folder"></i>'
+                        items:
+                            admin:                ~
+                            label:                ~
+                            route:                ~
+                            route_params:         []
                         item_adds:            []
                         roles:                []
                 blocks:
                     type:                 ~
+                    roles:                []
                     settings:
 
                         # Prototype
-                        id:                   []
+                        id:                   ~
                     position:             right
+                    class:                col-md-4
             admin_services:
+                model_manager:        null
+                form_contractor:      null
+                show_builder:         null
+                list_builder:         null
+                datagrid_builder:     null
+                translator:           null
+                configuration_pool:   null
+                route_generator:      null
+                validator:            null
+                security_handler:     null
+                label:                null
+                menu_factory:         null
+                route_builder:        null
+                label_translator_strategy:  null
+                pager_type:           null
+                templates:
+                    form:                 []
+                    filter:               []
+                    view:
 
-                # Prototype
-                id:
-                    model_manager:        ~
-                    form_contractor:      ~
-                    show_builder:         ~
-                    list_builder:         ~
-                    datagrid_builder:     ~
-                    translator:           ~
-                    configuration_pool:   ~
-                    router:               ~
-                    validator:            ~
-                    security_handler:     ~
-                    label:                ~
+                        # Prototype
+                        id:                   ~
             templates:
-                user_block:           SonataAdminBundle:Core:user_block.html.twig
-                add_block:            SonataAdminBundle:Core:add_block.html.twig
-                layout:               SonataAdminBundle::standard_layout.html.twig
-                ajax:                 SonataAdminBundle::ajax_layout.html.twig
-                dashboard:            SonataAdminBundle:Core:dashboard.html.twig
-                search:               SonataAdminBundle:Core:search.html.twig
-                list:                 SonataAdminBundle:CRUD:list.html.twig
-                filter:               SonataAdminBundle:Form:filter_admin_fields.html.twig
-                show:                 SonataAdminBundle:CRUD:show.html.twig
-                show_compare:         SonataAdminBundle:CRUD:show_compare.html.twig
-                edit:                 SonataAdminBundle:CRUD:edit.html.twig
-                preview:              SonataAdminBundle:CRUD:preview.html.twig
-                history:              SonataAdminBundle:CRUD:history.html.twig
-                acl:                  SonataAdminBundle:CRUD:acl.html.twig
-                history_revision_timestamp:  SonataAdminBundle:CRUD:history_revision_timestamp.html.twig
-                action:               SonataAdminBundle:CRUD:action.html.twig
-                select:               SonataAdminBundle:CRUD:list__select.html.twig
-                list_block:           SonataAdminBundle:Block:block_admin_list.html.twig
-                search_result_block:  SonataAdminBundle:Block:block_search_result.html.twig
-                short_object_description:  SonataAdminBundle:Helper:short-object-description.html.twig
-                delete:               SonataAdminBundle:CRUD:delete.html.twig
-                batch:                SonataAdminBundle:CRUD:list__batch.html.twig
-                batch_confirmation:   SonataAdminBundle:CRUD:batch_confirmation.html.twig
-                inner_list_row:       SonataAdminBundle:CRUD:list_inner_row.html.twig
-                base_list_field:      SonataAdminBundle:CRUD:base_list_field.html.twig
-                pager_links:          SonataAdminBundle:Pager:links.html.twig
-                pager_results:        SonataAdminBundle:Pager:results.html.twig
-                tab_menu_template:    SonataAdminBundle:Core:tab_menu_template.html.twig
-
+                user_block:           'SonataAdminBundle:Core:user_block.html.twig'
+                add_block:            'SonataAdminBundle:Core:add_block.html.twig'
+                layout:               'SonataAdminBundle::standard_layout.html.twig'
+                ajax:                 'SonataAdminBundle::ajax_layout.html.twig'
+                dashboard:            'SonataAdminBundle:Core:dashboard.html.twig'
+                search:               'SonataAdminBundle:Core:search.html.twig'
+                list:                 'SonataAdminBundle:CRUD:list.html.twig'
+                filter:               'SonataAdminBundle:Form:filter_admin_fields.html.twig'
+                show:                 'SonataAdminBundle:CRUD:show.html.twig'
+                show_compare:         'SonataAdminBundle:CRUD:show_compare.html.twig'
+                edit:                 'SonataAdminBundle:CRUD:edit.html.twig'
+                preview:              'SonataAdminBundle:CRUD:preview.html.twig'
+                history:              'SonataAdminBundle:CRUD:history.html.twig'
+                acl:                  'SonataAdminBundle:CRUD:acl.html.twig'
+                history_revision_timestamp:  'SonataAdminBundle:CRUD:history_revision_timestamp.html.twig'
+                action:               'SonataAdminBundle:CRUD:action.html.twig'
+                select:               'SonataAdminBundle:CRUD:list__select.html.twig'
+                list_block:           'SonataAdminBundle:Block:block_admin_list.html.twig'
+                search_result_block:  'SonataAdminBundle:Block:block_search_result.html.twig'
+                short_object_description:  'SonataAdminBundle:Helper:short-object-description.html.twig'
+                delete:               'SonataAdminBundle:CRUD:delete.html.twig'
+                batch:                'SonataAdminBundle:CRUD:list__batch.html.twig'
+                batch_confirmation:   'SonataAdminBundle:CRUD:batch_confirmation.html.twig'
+                inner_list_row:       'SonataAdminBundle:CRUD:list_inner_row.html.twig'
+                outer_list_rows_mosaic:  'SonataAdminBundle:CRUD:list_outer_rows_mosaic.html.twig'
+                outer_list_rows_list:  'SonataAdminBundle:CRUD:list_outer_rows_list.html.twig'
+                outer_list_rows_tree:  'SonataAdminBundle:CRUD:list_outer_rows_tree.html.twig'
+                base_list_field:      'SonataAdminBundle:CRUD:base_list_field.html.twig'
+                pager_links:          'SonataAdminBundle:Pager:links.html.twig'
+                pager_results:        'SonataAdminBundle:Pager:results.html.twig'
+                tab_menu_template:    'SonataAdminBundle:Core:tab_menu_template.html.twig'
+                knp_menu_template:    'SonataAdminBundle:Menu:sonata_menu.html.twig'
             assets:
                 stylesheets:
+
                     # Defaults:
                     - bundles/sonatacore/vendor/bootstrap/dist/css/bootstrap.min.css
                     - bundles/sonatacore/vendor/components-font-awesome/css/font-awesome.min.css
                     - bundles/sonatacore/vendor/ionicons/css/ionicons.min.css
-                    - bundles/sonataadmin/vendor/AdminLTE/css/AdminLTE.css
+                    - bundles/sonataadmin/vendor/admin-lte/dist/css/AdminLTE.min.css
+                    - bundles/sonataadmin/vendor/admin-lte/dist/css/skins/skin-black.min.css
+                    - bundles/sonataadmin/vendor/iCheck/skins/flat/blue.css
                     - bundles/sonatacore/vendor/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css
                     - bundles/sonataadmin/vendor/jqueryui/themes/base/jquery-ui.css
                     - bundles/sonatacore/vendor/select2/select2.css
-                    - bundles/sonatacore/vendor/select2/select2-bootstrap.css
+                    - bundles/sonatacore/vendor/select2-bootstrap-css/select2-bootstrap.min.css
                     - bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css
                     - bundles/sonataadmin/css/styles.css
                     - bundles/sonataadmin/css/layout.css
                     - bundles/sonataadmin/css/tree.css
-
                 javascripts:
+
                     # Defaults:
                     - bundles/sonatacore/vendor/jquery/dist/jquery.min.js
                     - bundles/sonataadmin/vendor/jquery.scrollTo/jquery.scrollTo.min.js
@@ -154,10 +176,11 @@ Full Configuration Options
                     - bundles/sonataadmin/jquery/jquery.confirmExit.js
                     - bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.min.js
                     - bundles/sonatacore/vendor/select2/select2.min.js
-                    - bundles/sonataadmin/App.js
+                    - bundles/sonataadmin/vendor/admin-lte/dist/js/app.min.js
+                    - bundles/sonataadmin/vendor/iCheck/icheck.min.js
+                    - bundles/sonataadmin/vendor/slimScroll/jquery.slimscroll.min.js
                     - bundles/sonataadmin/Admin.js
                     - bundles/sonataadmin/treeview.js
-
             extensions:
 
                 # Prototype
@@ -167,5 +190,4 @@ Full Configuration Options
                     implements:           []
                     extends:              []
                     instanceof:           []
-            persist_filters:      false     # set to true to persist filter settings per admin module in the user's session
-
+            persist_filters:      false

+ 2 - 2
Resources/doc/reference/dashboard.rst

@@ -222,7 +222,7 @@ a text block and RSS feed block on the right. The configuration for this scenari
                         roles: [POST_READER]
                         settings:
                             title: Sonata Project's Feeds
-                            url: http://sonata-project.org/blog/archive.rss
+                            url: https://sonata-project.org/blog/archive.rss
 
 
 .. note::
@@ -277,7 +277,7 @@ suit this scenario.
 In this example, you would have two ``admin_list`` blocks on your dashboard, each
 of them containing just the respectively configured groups.
 
-.. _`SonataBlock documentation page`:  http://sonata-project.org/bundles/block/master/doc/index.html
+.. _`SonataBlock documentation page`:  https://sonata-project.org/bundles/block/master/doc/index.html
 
 Dashboard Layout
 ~~~~~~~~~~~~~~~~

+ 1 - 1
Resources/doc/reference/events.rst

@@ -46,4 +46,4 @@ Block events help you customize your templates. Available events are :
  - ``sonata.admin.show.bottom``
 
 If you want more information about block events, you should check the
-`"Event" section of block bundle documentation <http://sonata-project.org/bundles/block/master/doc/reference/events.html>`_.
+`"Event" section of block bundle documentation <https://sonata-project.org/bundles/block/master/doc/reference/events.html>`_.

+ 1 - 1
Resources/doc/reference/form_types.rst

@@ -531,4 +531,4 @@ ChoiceType
 .. _`Symfony field types`: http://symfony.com/doc/current/book/forms.html#built-in-field-types
 .. _`Symfony choice Field Type docs`: http://symfony.com/doc/current/reference/forms/types/choice.html
 .. _`Symfony PropertyPath`: http://api.symfony.com/2.0/Symfony/Component/Form/Util/PropertyPath.html
-.. _`Getting started documentation`: http://sonata-project.org/bundles/admin/master/doc/reference/getting_started.html#importing-it-in-the-main-config-yml
+.. _`Getting started documentation`: https://sonata-project.org/bundles/admin/master/doc/reference/getting_started.html#importing-it-in-the-main-config-yml

+ 3 - 3
Resources/doc/reference/installation.rst

@@ -29,9 +29,9 @@ mechanisms. Depending on which you are using on your project, you'll need to ins
 one of the following bundles. In the respective links you'll find simple installation
 instructions for each of them:
 
-    - `SonataDoctrineORMAdminBundle <http://sonata-project.org/bundles/doctrine-orm-admin/master/doc/reference/installation.html>`_
+    - `SonataDoctrineORMAdminBundle <https://sonata-project.org/bundles/doctrine-orm-admin/master/doc/reference/installation.html>`_
     - `SonataDoctrineMongoDBAdminBundle <https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/blob/master/Resources/doc/reference/installation.rst>`_
-    - `SonataPropelAdminBundle <http://sonata-project.org/bundles/propel-admin/master/doc/reference/installation.html>`_
+    - `SonataPropelAdminBundle <https://sonata-project.org/bundles/propel-admin/master/doc/reference/installation.html>`_
     - `SonataDoctrinePhpcrAdminBundle <https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/blob/master/Resources/doc/reference/installation.rst>`_
 
 .. note::
@@ -44,7 +44,7 @@ SonataAdminBundle relies on other bundles to implement some features.
 Besides the storage layer mentioned on step 2, there are other bundles needed
 for SonataAdminBundle to work:
 
-    - `SonataBlockBundle <http://sonata-project.org/bundles/block/master/doc/reference/installation.html>`_
+    - `SonataBlockBundle <https://sonata-project.org/bundles/block/master/doc/reference/installation.html>`_
     - `KnpMenuBundle <https://github.com/KnpLabs/KnpMenuBundle/blob/master/Resources/doc/index.md#installation>`_ (Version 2.*)
 
 These bundles are automatically downloaded by composer as a dependency of SonataAdminBundle.

+ 3 - 3
Resources/doc/reference/security.rst

@@ -468,8 +468,8 @@ Vocabulary used for Access Control Lists:
   There can be many voters that may have different permission maps. However,
   prevent that multiple voters vote on the same class with overlapping bitmasks.
 
-See the cookbook article "`Advanced ACL concepts 
-<http://symfony.com/doc/current/cookbook/security/acl_advanced.html#pre-authorization-decisions.>`_" 
+See the cookbook article "`Advanced ACL concepts
+<http://symfony.com/doc/current/cookbook/security/acl_advanced.html#pre-authorization-decisions.>`_"
 for the meaning of the different permissions.
 
 
@@ -734,6 +734,6 @@ service to use when retrieving your users.
             security:
                 acl_user_manager: my_user_manager # The name of your service
 
-.. _`SonataUserBundle's documentation area`: http://sonata-project.org/bundles/user/master/doc/reference/installation.html
+.. _`SonataUserBundle's documentation area`: https://sonata-project.org/bundles/user/master/doc/reference/installation.html
 .. _`changing the access decision strategy`: http://symfony.com/doc/2.2/cookbook/security/voters.html#changing-the-access-decision-strategy
 .. _`create your own voter`: http://symfony.com/doc/2.2/cookbook/security/voters.html

+ 2 - 2
Resources/views/standard_layout.html.twig

@@ -213,7 +213,7 @@ file that was distributed with this source code.
                                 {% endif %}
                             {% endblock side_bar_nav %}
                             {% block side_bar_after_nav %}
-                                <p class="text-center small" style="border-top: 1px solid #444444; padding-top: 10px"><a href="http://sonata-project.org" rel="noreferrer" target="_blank">sonata project</a></p>
+                                <p class="text-center small" style="border-top: 1px solid #444444; padding-top: 10px"><a href="https://sonata-project.org" rel="noreferrer" target="_blank">sonata project</a></p>
                             {% endblock %}
                         {% endblock sonata_side_nav %}
                     </section>
@@ -314,6 +314,6 @@ file that was distributed with this source code.
                 {% endblock sonata_page_content %}
             </div>
         {% endblock sonata_wrapper %}
-    </div>    
+    </div>
     </body>
 </html>

+ 2 - 2
composer.json

@@ -3,13 +3,13 @@
     "type": "symfony-bundle",
     "description": "Symfony SonataAdminBundle",
     "keywords": ["Admin Generator", "admin", "sonata", "bootstrap"],
-    "homepage": "http://sonata-project.org/bundles/admin",
+    "homepage": "https://sonata-project.org/bundles/admin",
     "license": "MIT",
     "authors": [
         {
             "name": "Thomas Rabaix",
             "email": "thomas.rabaix@sonata-project.org",
-            "homepage": "http://sonata-project.org"
+            "homepage": "https://sonata-project.org"
         },
         {
             "name": "Sonata Community",