Support for different preview image borders

Strip trailing whitespaces

7 files changed, 22 insertions, 1 deletions

diff --git a/sample/src/CIAF_1/img_6802e.jpg b/sample/src/CIAF_1/img_6802e.jpg
new file mode 120000
index 0000000..d6b7d1d
--- /dev/null
+++ b/sample/src/CIAF_1/img_6802e.jpg
@@ -0,0 +1 @@
+img_6802.jpg
\ No newline at end of file
diff --git a/sample/src/CIAF_1/img_6802f.jpg b/sample/src/CIAF_1/img_6802f.jpg
new file mode 120000
index 0000000..d6b7d1d
--- /dev/null
+++ b/sample/src/CIAF_1/img_6802f.jpg
@@ -0,0 +1 @@
+img_6802.jpg
\ No newline at end of file
diff --git a/sample/src/CIAF_1/index.xml b/sample/src/CIAF_1/index.xml
index 788fc95..fe98cc2 100644
--- a/sample/src/CIAF_1/index.xml
+++ b/sample/src/CIAF_1/index.xml
@@ -6,10 +6,14 @@
     <description><![CDATA[8. - 9. září 2007<br/>
                           mezinárodní letiště Brno - Tuřany<br/>
                           <a href="http://www.airshow.cz/18-CZ-CIAF-07-Home.html">http://www.airshow.cz/18-CZ-CIAF-07-Home.html</a><br/>
+                          <br/><br/>
+                          This album sets border style "border_none" for preview images.
     ]]></description>
 
     <!--  you can override global settings in each album:  -->    
     <images quality="60" landscape_w="640" landscape_h="480" portrait_w="480" portrait_h="640" />
+    <!--  override global preview image border style -->
+    <border style="border_none" />
   </general>
   
   <items>
@@ -54,5 +58,15 @@
       <title_description><![CDATA[Can contain <a href="http://cgg.bzatek.net/" title="Cataract Gallery Generator" class="footermail">links</a> etc...]]></title_description>
     </item>
 
+    <item src="img_6802e.jpg" border="frame_white">
+      <title>White frame</title>
+      <title_description>This particular image overrides both global and album border styles.</title_description>
+    </item>
+
+    <item src="img_6802f.jpg" border="frame_black">
+      <title>Black frame</title>
+      <title_description>This particular image overrides both global and album border styles.</title_description>
+    </item>
+
   </items>
 </gallery>
diff --git a/sample/src/CIAF_1/preview/img_6802d.jpg b/sample/src/CIAF_1/preview/img_6802d.jpg
new file mode 120000
index 0000000..d6b7d1d
--- /dev/null
+++ b/sample/src/CIAF_1/preview/img_6802d.jpg
@@ -0,0 +1 @@
+img_6802.jpg
\ No newline at end of file
diff --git a/sample/src/CIAF_1/preview/img_6802e.jpg b/sample/src/CIAF_1/preview/img_6802e.jpg
new file mode 120000
index 0000000..d6b7d1d
--- /dev/null
+++ b/sample/src/CIAF_1/preview/img_6802e.jpg
@@ -0,0 +1 @@
+img_6802.jpg
\ No newline at end of file
diff --git a/sample/src/CIAF_1/preview/img_6802f.jpg b/sample/src/CIAF_1/preview/img_6802f.jpg
new file mode 120000
index 0000000..d6b7d1d
--- /dev/null
+++ b/sample/src/CIAF_1/preview/img_6802f.jpg
@@ -0,0 +1 @@
+img_6802.jpg
\ No newline at end of file
diff --git a/sample/src/setup.xml b/sample/src/setup.xml
index ae92918..8f4b632 100644
--- a/sample/src/setup.xml
+++ b/sample/src/setup.xml
@@ -20,10 +20,12 @@
     <!--  default sizes of thumbnail and preview images  -->
     <thumbnail landscape_w="180" landscape_h="120" 
                portrait_w="120" portrait_h="180"
-               quality="95" />
+               quality="80" />
     <preview landscape_w="900" landscape_h="600" 
              portrait_w="500" portrait_h="750"
              quality="95" />
+    <!--  preview image border style - use your custom CSS style to display frame around image -->
+    <border style="border_single" />
   </images>
   
   <footer><![CDATA[