From 18878f8bb0bb23403772504ab4d94a34c85ecaf4 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Mon, 28 Mar 2011 12:41:09 +0000
Subject: use combine_css for languageSwitch plugin

git-svn-id: http://piwigo.org/svn/trunk@9905 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 plugins/language_switch/flags.tpl                  | 81 +++++++++++-----------
 plugins/language_switch/language_switch-Sylvia.css |  6 ++
 plugins/language_switch/language_switch.css        |  8 ---
 3 files changed, 47 insertions(+), 48 deletions(-)
 create mode 100644 plugins/language_switch/language_switch-Sylvia.css
 delete mode 100644 plugins/language_switch/language_switch.css

diff --git a/plugins/language_switch/flags.tpl b/plugins/language_switch/flags.tpl
index 6d51cad38..eb855fc69 100644
--- a/plugins/language_switch/flags.tpl
+++ b/plugins/language_switch/flags.tpl
@@ -1,48 +1,49 @@
 </ul>
 <ul class="categoryActions">
 <li class="menuf">
-	<div>
-		<ul>
-			<li>
-				<a rel="nofollow" href="#">
-					<img class="flags" src="{$lang_switch.Active.img}" alt="{$lang_switch.Active.alt}" title="{$lang_switch.Active.alt}"/>
-				</a>
-				<!--[if lte IE 6]>
-					<a rel="nofollow" href="#">
-						<img class="flags" src="{$lang_switch.Active.img}" alt="{$lang_switch.Active.alt}" title="{$lang_switch.Active.alt}"/>
-						<table>
-							<tr>
-								<td>
-				<![endif]-->
-									<ul class="flag-pan">
-									{foreach from=$lang_switch.flags key=code item=flag name=f}
-										<li>
-											<a rel="nofollow" href="{$SCRIPT_NAME}{$flag.url}">
-												<img class="flags" src="{$flag.img}" alt="{$flag.alt}" title="{$flag.alt}"/>
-											</a>
-										</li>
-									{/foreach}
-									</ul>
-				<!--[if lte IE 6]>
-								</td>
-							</tr>
-						</table>
-					</a>
-				<![endif]-->
-			</li>
-		</ul>
-	</div>
+  <div>
+    <ul>
+      <li>
+        <a rel="nofollow" href="#">
+          <img class="flags" src="{$lang_switch.Active.img}" alt="{$lang_switch.Active.alt}" title="{$lang_switch.Active.alt}"/>
+        </a>
+<!--[if lte IE 6]>
+        <a rel="nofollow" href="#">
+          <img class="flags" src="{$lang_switch.Active.img}" alt="{$lang_switch.Active.alt}" title="{$lang_switch.Active.alt}"/>
+          <table>
+            <tr>
+              <td>
+<![endif]-->
+        <ul class="flag-pan">
+
+{foreach from=$lang_switch.flags key=code item=flag name=f}
+          <li>
+            <a rel="nofollow" href="{$SCRIPT_NAME}{$flag.url}">
+              <img class="flags" src="{$flag.img}" alt="{$flag.alt}" title="{$flag.alt}"/>
+            </a>
+          </li>
+{/foreach}
+
+        </ul>
+<!--[if lte IE 6]>
+              </td>
+            </tr>
+          </table>
+        </a>
+<![endif]-->
+      </li>
+    </ul>
+  </div>
 </li>
-{html_head}
-{if $themeconf.name == 'Sylvia'}
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch.css'}"> 
-{else}
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-default.css'}"> 
-{/if}
-{if Componant_exists($LANGUAGE_SWITCH_PATH, 'language_switch-local.css')}
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-local.css'}"> 
+
+{combine_css path="plugins/language_switch/language_switch-default.css"}
+
+{if $themeconf.name eq 'Sylvia'}
+{combine_css path="plugins/language_switch/language_switch-Sylvia.css"}
 {/if}
+
+{html_head}
 <!--[if lte IE 6]>
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-ie6.css'}"> 
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}plugins/language_switch/language_switch-ie6.css">
 <![endif]-->
 {/html_head}
\ No newline at end of file
diff --git a/plugins/language_switch/language_switch-Sylvia.css b/plugins/language_switch/language_switch-Sylvia.css
new file mode 100644
index 000000000..f3bf91d9f
--- /dev/null
+++ b/plugins/language_switch/language_switch-Sylvia.css
@@ -0,0 +1,6 @@
+.flag-pan { border:1px solid; background-color: #111; }
+.menuf .flags {border-color: #000 !important; }
+
+.flag-pan { 	border-radius: 8px; } /* round corners with CSS3 compliant browsers */
+.flag-pan { -moz-border-radius:8px; } 
+.flag-pan { -webkit-border-radius: 8px; }
\ No newline at end of file
diff --git a/plugins/language_switch/language_switch.css b/plugins/language_switch/language_switch.css
deleted file mode 100644
index 2cfc88b35..000000000
--- a/plugins/language_switch/language_switch.css
+++ /dev/null
@@ -1,8 +0,0 @@
-@import "language_switch-default.css";
-
-.flag-pan { border:1px solid; background-color: #111; }
-.menuf .flags {border-color: #000 !important; }
-
-.flag-pan { 	border-radius: 8px; } /* round corners with CSS3 compliant browsers */
-.flag-pan { -moz-border-radius:8px; } 
-.flag-pan { -webkit-border-radius: 8px; }
\ No newline at end of file
-- 
cgit v1.2.3