Project files should not mix end of lines

This commit is contained in:
Simon Vieille 2015-03-05 16:48:08 +01:00
parent 5bf864d7c9
commit cefa5d4ded
3 changed files with 66 additions and 66 deletions

View file

@ -1,32 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<database name="default" <database name="default"
namespace="Trinity\Bundle\SlideshowBundle\Model" namespace="Trinity\Bundle\SlideshowBundle\Model"
defaultIdMethod="native" defaultIdMethod="native"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://xsd.propelorm.org/1.6/database.xsd"> xsi:noNamespaceSchemaLocation="http://xsd.propelorm.org/1.6/database.xsd">
<external-schema filename="../../../ContentManagerBundle/Resources/config/cms_schema.xml" referenceOnly="true"/> <external-schema filename="../../../ContentManagerBundle/Resources/config/cms_schema.xml" referenceOnly="true"/>
<table name="slideshow_item" phpName="SlideshowItem"> <table name="slideshow_item" phpName="SlideshowItem">
<column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" /> <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
<column name="uid" type="integer" required="true" /> <column name="uid" type="integer" required="true" />
<column name="cms_block_id" type="integer" required="true" /> <column name="cms_block_id" type="integer" required="true" />
<column name="title" type="varchar" size="128" required="false" /> <column name="title" type="varchar" size="128" required="false" />
<column name="rank" type="integer" default="0" /> <column name="rank" type="integer" default="0" />
<column name="picture" type="varchar" size="128" required="true" /> <column name="picture" type="varchar" size="128" required="true" />
<column name="content" type="longvarchar" required="true" /> <column name="content" type="longvarchar" required="true" />
<column name="link" type="varchar" size="255" /> <column name="link" type="varchar" size="255" />
<behavior name="uploadable"> <behavior name="uploadable">
<parameter name="fields" value="picture" /> <parameter name="fields" value="picture" />
<parameter name="paths" value="uploads/slideshow/" /> <parameter name="paths" value="uploads/slideshow/" />
</behavior> </behavior>
<foreign-key foreignTable="cms_block"> <foreign-key foreignTable="cms_block">
<reference local="cms_block_id" foreign="id"/> <reference local="cms_block_id" foreign="id"/>
</foreign-key> </foreign-key>
</table> </table>
</database> </database>

View file

@ -1,29 +1,29 @@
form: form:
page: page:
template: template:
help: '<strong>Chemin Symfony</strong> du template (exemple : TrinityContentManagerBundle::default.html.twig)' help: '<strong>Chemin Symfony</strong> du template (exemple : TrinityContentManagerBundle::default.html.twig)'
dataModel: dataModel:
help: '' help: ''
field: field:
file: file:
delete: 'Supprimer' delete: 'Supprimer'
open: 'Ouvrir' open: 'Ouvrir'
Preview: 'Prévisualiser' Preview: 'Prévisualiser'
slideshow_items_container: slideshow_items_container:
items: 'Liste des diaporamas' items: 'Liste des diaporamas'
no_blocks: 'Aucune visionneuse enregistré.' no_blocks: 'Aucune visionneuse enregistré.'
no_associated_blocks: 'Aucune visionneuse associé.' no_associated_blocks: 'Aucune visionneuse associé.'
no_slideshow_item: 'Aucune diapo enregistrée' no_slideshow_item: 'Aucune diapo enregistrée'
add: 'Ajouter une diaporama' add: 'Ajouter une diaporama'
cms: cms:
node: node:
action: action:
edit: 'Modifier ce diaporama' edit: 'Modifier ce diaporama'
remove: 'Supprimer ce diaporama' remove: 'Supprimer ce diaporama'
slider: slider:
add: add:
preview: 'Prévisualiser' preview: 'Prévisualiser'
remove: 'Supprimer' remove: 'Supprimer'

View file

@ -1,8 +1,8 @@
<ul class="slideshow"> <ul class="slideshow">
{% for item in block.getSlideshowItems %} {% for item in block.getSlideshowItems %}
<li> <li>
<img src="{{ asset(item.picture) }}" alt="{{ item.title }}" title="{{ item.title }}" /> <img src="{{ asset(item.picture) }}" alt="{{ item.title }}" title="{{ item.title }}" />
{{ item.content }} {{ item.content }}
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>