From: Benoît Pin <benoit.pin@gmail.com>
Date: Wed, 23 Jul 2014 05:13:04 +0000 (+0200)
Subject: Introduction de règles de style spécifiques aux contenus pour utilisation via ckeditor.
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Plinn.git/commitdiff_plain/e957cc2a18fd2363fe6451c2cff2edd452379f66?hp=55eea9a336dd3e6ad94e38822dbc49145e15424d

Introduction de règles de style spécifiques aux contenus pour utilisation via ckeditor.
---

diff --git a/skins/generic/base_properties.props b/skins/generic/base_properties.props
index c0a8ac2..53d55c9 100644
--- a/skins/generic/base_properties.props
+++ b/skins/generic/base_properties.props
@@ -63,3 +63,5 @@ boxeHeaderBackgroundColor:string=#fff
 
 twoColumnFormFontColor:string=#000
 twoColumnFormBackground:string=#ddd
+
+borderRadius:int=7
diff --git a/skins/generic/content_style.css.dtml b/skins/generic/content_style.css.dtml
new file mode 100644
index 0000000..0748908
--- /dev/null
+++ b/skins/generic/content_style.css.dtml
@@ -0,0 +1,7 @@
+/* <dtml-with base_properties> */
+
+.rounded-corners {
+	border-radius: &dtml-borderRadius;px;
+}
+
+/*</dtml-with> */
\ No newline at end of file
diff --git a/skins/generic/global_plinn_style.css.dtml b/skins/generic/global_plinn_style.css.dtml
index 63963ce..6f5e53a 100644
--- a/skins/generic/global_plinn_style.css.dtml
+++ b/skins/generic/global_plinn_style.css.dtml
@@ -4,5 +4,8 @@
 /* plinn_style.css */
 <dtml-var plinn_style.css>
 
+/* content_style.css */
+<dtml-var content_style.css>
+
 /* Portfolio */
 <dtml-var portfolio_style.css>
diff --git a/skins/generic/plinn_ckeditor_styles.js.dtml b/skins/generic/plinn_ckeditor_styles.js.dtml
index 2d4711e..1fca357 100644
--- a/skins/generic/plinn_ckeditor_styles.js.dtml
+++ b/skins/generic/plinn_ckeditor_styles.js.dtml
@@ -15,12 +15,17 @@
 //The name and element values are required, while other values are optional.
 
 CKEDITOR.stylesSet.add( 'plinn_styles', [
-    { name: 'Coins arrondis',
+    { name: 'Bloc arrondi',
       element: 'div',
-      attributes : {'class' : 'news_box'}
+      attributes : {'class' : 'rounded-corners'}
     },
-    { name: 'cellule arrondie',
+    { name: 'Cellule arrondie',
       element: 'td',
-      attributes : {'class' : 'news_box'}
+      attributes : {'class' : 'rounded-corners'}
     },
+    { name: 'Image arrondie',
+      element: 'img',
+      attributes : {'class' : 'rounded-corners'}
+    },
+
 ]);
diff --git a/skins/photo_theme/base_properties.props b/skins/photo_theme/base_properties.props
old mode 100755
new mode 100644
index a32b6ea..471a272
--- a/skins/photo_theme/base_properties.props
+++ b/skins/photo_theme/base_properties.props
@@ -63,3 +63,5 @@ boxeHeaderBackgroundColor:string=#484848
 
 twoColumnFormFontColor:string=#fff
 twoColumnFormBackground:string=#3A3A3A
+
+borderRadius:int=7
diff --git a/skins/photo_theme/global_plinn_style.css.dtml b/skins/photo_theme/global_plinn_style.css.dtml
index a5f5f3d..ab58319 100755
--- a/skins/photo_theme/global_plinn_style.css.dtml
+++ b/skins/photo_theme/global_plinn_style.css.dtml
@@ -4,6 +4,9 @@
 /* plinn_style.css */
 <dtml-var plinn_style.css>
 
+/* content_style.css */
+<dtml-var content_style.css>
+
 /* Portfolio */
 <dtml-var portfolio_style.css>