From cefa5d4ded2aca06e5aa25d69cb5abba09d61ad5 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Thu, 5 Mar 2015 16:48:08 +0100
Subject: [PATCH] Project files should not mix end of lines

---
 .../Resources/config/schema.xml               | 62 +++++++++----------
 .../TrinitySlideshowBundle.fr.yml             | 56 ++++++++---------
 .../Resources/views/Block/slideshow.html.twig | 14 ++---
 3 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/src/Trinity/Bundle/SlideshowBundle/Resources/config/schema.xml b/src/Trinity/Bundle/SlideshowBundle/Resources/config/schema.xml
index f85d060..6dc537e 100755
--- a/src/Trinity/Bundle/SlideshowBundle/Resources/config/schema.xml
+++ b/src/Trinity/Bundle/SlideshowBundle/Resources/config/schema.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<database name="default"
-          namespace="Trinity\Bundle\SlideshowBundle\Model"
-          defaultIdMethod="native"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://xsd.propelorm.org/1.6/database.xsd">
-
-    <external-schema filename="../../../ContentManagerBundle/Resources/config/cms_schema.xml" referenceOnly="true"/>
-
-    <table name="slideshow_item" phpName="SlideshowItem">
-        <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
-        <column name="uid" type="integer" required="true" />
-        <column name="cms_block_id" type="integer" required="true" />
-        <column name="title" type="varchar" size="128" required="false" />
-        <column name="rank" type="integer" default="0" />
-        <column name="picture" type="varchar" size="128" required="true" />
-        <column name="content" type="longvarchar" required="true" />
-        <column name="link" type="varchar" size="255" />
-
-        <behavior name="uploadable">
-            <parameter name="fields" value="picture" />
-            <parameter name="paths" value="uploads/slideshow/" />
-        </behavior>
-
-        <foreign-key foreignTable="cms_block">
-            <reference local="cms_block_id" foreign="id"/>
-        </foreign-key>
-
-    </table>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<database name="default"
+          namespace="Trinity\Bundle\SlideshowBundle\Model"
+          defaultIdMethod="native"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="http://xsd.propelorm.org/1.6/database.xsd">
+
+    <external-schema filename="../../../ContentManagerBundle/Resources/config/cms_schema.xml" referenceOnly="true"/>
+
+    <table name="slideshow_item" phpName="SlideshowItem">
+        <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
+        <column name="uid" type="integer" required="true" />
+        <column name="cms_block_id" type="integer" required="true" />
+        <column name="title" type="varchar" size="128" required="false" />
+        <column name="rank" type="integer" default="0" />
+        <column name="picture" type="varchar" size="128" required="true" />
+        <column name="content" type="longvarchar" required="true" />
+        <column name="link" type="varchar" size="255" />
+
+        <behavior name="uploadable">
+            <parameter name="fields" value="picture" />
+            <parameter name="paths" value="uploads/slideshow/" />
+        </behavior>
+
+        <foreign-key foreignTable="cms_block">
+            <reference local="cms_block_id" foreign="id"/>
+        </foreign-key>
+
+    </table>
+
+
 </database>
\ No newline at end of file
diff --git a/src/Trinity/Bundle/SlideshowBundle/Resources/translations/TrinitySlideshowBundle.fr.yml b/src/Trinity/Bundle/SlideshowBundle/Resources/translations/TrinitySlideshowBundle.fr.yml
index 09d86bf..10e1b6f 100755
--- a/src/Trinity/Bundle/SlideshowBundle/Resources/translations/TrinitySlideshowBundle.fr.yml
+++ b/src/Trinity/Bundle/SlideshowBundle/Resources/translations/TrinitySlideshowBundle.fr.yml
@@ -1,29 +1,29 @@
-form:
-    page:
-        template:
-            help: '<strong>Chemin Symfony</strong> du template (exemple : TrinityContentManagerBundle::default.html.twig)'
-        dataModel:
-            help: ''
-
-    field:
-        file:
-            delete: 'Supprimer'
-            open: 'Ouvrir'
-            Preview: 'Prévisualiser'
-        slideshow_items_container:
-            items: 'Liste des diaporamas'
-            no_blocks: 'Aucune visionneuse enregistré.'
-            no_associated_blocks: 'Aucune visionneuse associé.'
-            no_slideshow_item:  'Aucune diapo enregistrée'
-            add: 'Ajouter une diaporama'
-
-cms:
-    node:
-        action:
-            edit: 'Modifier ce diaporama'
-            remove: 'Supprimer ce diaporama'
-
-slider:
-    add:
-        preview: 'Prévisualiser'
+form:
+    page:
+        template:
+            help: '<strong>Chemin Symfony</strong> du template (exemple : TrinityContentManagerBundle::default.html.twig)'
+        dataModel:
+            help: ''
+
+    field:
+        file:
+            delete: 'Supprimer'
+            open: 'Ouvrir'
+            Preview: 'Prévisualiser'
+        slideshow_items_container:
+            items: 'Liste des diaporamas'
+            no_blocks: 'Aucune visionneuse enregistré.'
+            no_associated_blocks: 'Aucune visionneuse associé.'
+            no_slideshow_item:  'Aucune diapo enregistrée'
+            add: 'Ajouter une diaporama'
+
+cms:
+    node:
+        action:
+            edit: 'Modifier ce diaporama'
+            remove: 'Supprimer ce diaporama'
+
+slider:
+    add:
+        preview: 'Prévisualiser'
         remove: 'Supprimer'
\ No newline at end of file
diff --git a/src/Trinity/Bundle/SlideshowBundle/Resources/views/Block/slideshow.html.twig b/src/Trinity/Bundle/SlideshowBundle/Resources/views/Block/slideshow.html.twig
index 4740a29..4ecd560 100755
--- a/src/Trinity/Bundle/SlideshowBundle/Resources/views/Block/slideshow.html.twig
+++ b/src/Trinity/Bundle/SlideshowBundle/Resources/views/Block/slideshow.html.twig
@@ -1,8 +1,8 @@
-<ul class="slideshow">
-    {% for item in block.getSlideshowItems %}
-        <li>
-            <img src="{{ asset(item.picture) }}" alt="{{ item.title }}" title="{{ item.title }}" />
-            {{ item.content }}
-        </li>
-    {% endfor %}
+<ul class="slideshow">
+    {% for item in block.getSlideshowItems %}
+        <li>
+            <img src="{{ asset(item.picture) }}" alt="{{ item.title }}" title="{{ item.title }}" />
+            {{ item.content }}
+        </li>
+    {% endfor %}
 </ul>
\ No newline at end of file