From 2b2d133e971ff7ef8c59cf8eef0c4ef0254db16c Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Thu, 21 Jan 2016 13:00:19 +0000
Subject: [PATCH] Prepare Debian libs usage for Debian official release

---
 Makefile                                       |  7 ++++---
 lemonldap-ng-manager/site/templates/header.tpl |  6 +++++-
 .../site/templates/scripts.tpl                 | 11 ++++++++++-
 .../example/skins/bootstrap/header.tpl         | 12 ++++++++++--
 .../example/skins/common/script.tpl            | 10 ++++++----
 scripts/transform-templates                    | 18 +++++++++++++-----
 6 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 96438203f..4f9dde7e9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,8 @@
 DESTDIR=
 
 # Flag for optimizations
-PROD=no
+USEDEBIANLIBS=no
+PROD=$(USEDEBIANLIBS)
 
 # Compression
 JSCOMPRESS=$(PROD)
@@ -434,7 +435,7 @@ install_manager_site:	install_conf_dir
 		$(RMANAGERTEMPLATESDIR)
 	@cp -pR $(SRCMANAGERDIR)/site/static/* $(RMANAGERSTATICDIR)
 	@for f in $(SRCMANAGERDIR)/site/templates/*.tpl; do \
-		./scripts/transform-templates jsminified $(JSCOMPRESS) cssminified $(CSSCOMPRESS) <$$f \
+		./scripts/transform-templates usedebianlibs $(USEDEBIANLIBS) jsminified $(JSCOMPRESS) cssminified $(CSSCOMPRESS) <$$f \
 			> $(RMANAGERTEMPLATESDIR)/`basename $$f`; \
 	done
 	@cp -pR $(SRCMANAGERDIR)/eg/* $(RMANAGERPSGIDIR)
@@ -461,7 +462,7 @@ install_portal_site:	install_conf_dir
 	@cp -pR -f ${SRCPORTALDIR}/example/register.pl ${RPORTALDIR}
 	@tar -cf - -C ${SRCPORTALDIR}/example/skins/ $$(ls ${SRCPORTALDIR}/example/skins/) |tar -xf - -C $(RPORTALSKINSDIR)
 	@for f in `find $(RPORTALSKINSDIR) -type f -name '*.tpl'`; do \
-		./scripts/transform-templates jsminified $(JSCOMPRESS) cssminified $(CSSCOMPRESS) <$$f >$$f.tmp; \
+		./scripts/transform-templates usedebianlibs $(USEDEBIANLIBS) jsminified $(JSCOMPRESS) cssminified $(CSSCOMPRESS) <$$f >$$f.tmp; \
 		mv -f $$f.tmp $$f; \
 	done
 	@if [ "$(PORTALDIR)/skins/" != "$(PORTALSKINSDIR)/" ]; then \
diff --git a/lemonldap-ng-manager/site/templates/header.tpl b/lemonldap-ng-manager/site/templates/header.tpl
index 1904412bd..bb6e5b374 100644
--- a/lemonldap-ng-manager/site/templates/header.tpl
+++ b/lemonldap-ng-manager/site/templates/header.tpl
@@ -7,7 +7,11 @@
   <link rel="shortcut icon" type="image/vnd.microsoft.icon" sizes="16x16 32x32 48x48 64x64 128x128" href="<TMPL_VAR NAME="STATIC_PREFIX">logos/favicon.ico" />
   <link rel="icon" type="image/vnd.microsoft.icon" sizes="16x16 32x32 48x48 64x64 128x128" href="<TMPL_VAR NAME="STATIC_PREFIX">logos/favicon.ico" />
   <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">bwr/angular-ui-tree/dist/angular-ui-tree.min.css" />
-<!-- //if:cssminified
+<!-- //if:usedebianlibs
+  <link rel="stylesheet" type="text/css" href="/javascript/bootstrap/css/bootstrap.min.css" />
+  <link rel="stylesheet" type="text/css" href="/javascript/bootstrap/css/bootstrap-theme.min.css" />
+  <link rel="stylesheet" type="text/css" href="css/manager.min.css" />
+//elsif:cssminified
   <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">bwr/bootstrap/dist/css/bootstrap.min.css" />
   <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">bwr/bootstrap/dist/css/bootstrap-theme.min.css" />
   <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">css/manager.min.css" />
diff --git a/lemonldap-ng-manager/site/templates/scripts.tpl b/lemonldap-ng-manager/site/templates/scripts.tpl
index 76b041007..90aaad308 100644
--- a/lemonldap-ng-manager/site/templates/scripts.tpl
+++ b/lemonldap-ng-manager/site/templates/scripts.tpl
@@ -29,7 +29,16 @@
   var menulinks=<TMPL_VAR NAME="MENULINKS">;
 </script>
 
-<!-- //if:jsminified
+<!-- //if:usedebianlibs
+<script type="text/javascript" src="/javascript/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="/javascript/es5-shim/es5-shim.min.js"></script>
+<script type="text/javascript" src="/javascript/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="/javascript/angular.js/angular.min.js"></script>
+<script type="text/javascript" src="/javascript/angular.js/angular-cookies.min.js"></script>
+<script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/angular-ui-tree/dist/angular-ui-tree.min.js"></script>
+<script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">js/ui-bootstrap-tpls-0.12.1.min.js"></script>
+<script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">js/llApp.min.js"></script>
+//elsif:jsminified
 <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/jquery/dist/jquery.min.js"></script>
 <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/es5-shim/es5-shim.min.js"></script>
 <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/bootstrap/dist/js/bootstrap.min.js"></script>
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/header.tpl b/lemonldap-ng-portal/example/skins/bootstrap/header.tpl
index a11bfb378..4f33866ee 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/header.tpl
+++ b/lemonldap-ng-portal/example/skins/bootstrap/header.tpl
@@ -9,7 +9,11 @@
  <TMPL_IF NAME="browserIdEnabled">
   <meta http-equiv="X-UA-Compatible" content="IE=Edge">
  </TMPL_IF>
-<!-- //if:cssminified
+<!-- //if:usedebianlibs
+ <link href="/javascript/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/javascript/bootstrap/css/bootstrap-theme.min.css" rel="stylesheet">
+ <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="SKIN_PATH">/<TMPL_VAR NAME="SKIN">/css/styles.min.css" />
+//elsif:cssminified
  <link href="<TMPL_VAR NAME="SKIN_PATH">/<TMPL_VAR NAME="SKIN">/css/bootstrap.min.css" rel="stylesheet">
  <link href="<TMPL_VAR NAME="SKIN_PATH">/<TMPL_VAR NAME="SKIN">/css/bootstrap-theme.min.css" rel="stylesheet">
  <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="SKIN_PATH">/<TMPL_VAR NAME="SKIN">/css/styles.min.css" />
@@ -32,7 +36,11 @@
   <link rel="openid2.provider" href="<TMPL_VAR NAME="PROVIDERURI">" />
  </TMPL_IF>
  <TMPL_INCLUDE NAME="../common/script.tpl">
- <!-- //if:jsminified
+<!-- //if:usedebianlibs
+  <script src="<TMPL_VAR NAME="SKIN_PATH">/<TMPL_VAR NAME="SKIN">/js/skin.min.js"></script>
+  <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/js/portal.min.js"></script>
+  <script type="text/javascript" src="/javascript/bootstrap/js/bootstrap.min.js"></script>
+ //elsif:jsminified
   <script src="<TMPL_VAR NAME="SKIN_PATH">/<TMPL_VAR NAME="SKIN">/js/skin.min.js"></script>
   <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/js/portal.min.js"></script>
   <script src="<TMPL_VAR NAME="SKIN_PATH">/<TMPL_VAR NAME="SKIN">/js/bootstrap.min.js"></script>
diff --git a/lemonldap-ng-portal/example/skins/common/script.tpl b/lemonldap-ng-portal/example/skins/common/script.tpl
index 350863d19..acb911c0d 100644
--- a/lemonldap-ng-portal/example/skins/common/script.tpl
+++ b/lemonldap-ng-portal/example/skins/common/script.tpl
@@ -1,5 +1,10 @@
  <!-- Load javascript common to all skins -->
- <!-- //if:jsminified
+ <!-- //if:usedebianlibs
+  <script type="text/javascript" src="/javascript/jquery/jquery.min.js"></script>
+  <script type="text/javascript" src="/javascript/jquery-ui/jquery-ui.min.js"></script>
+  <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/js/jquery.base64.min.js"></script>
+  <script type="text/javascript" src="/javascript/jquery-cookie/jquery.cookie.min.js"></script>
+ //elsif:jsminified
   <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/js/jquery-1.10.2.min.js"></script>
   <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/js/jquery-ui-1.10.3.custom.min.js"></script>
   <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/js/jquery.base64.min.js"></script>
@@ -11,9 +16,6 @@
   <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/js/jquery.cookie.js"></script>
  <!-- //endif -->
  <TMPL_IF NAME="browserIdEnabled">
-  <!-- //if:jsminified
-    <script src="https://login.persona.org/include.min.js"></script>
-  //else -->
    <script src="https://login.persona.org/include.js"></script>
   <!-- //endif -->
  </TMPL_IF>
diff --git a/scripts/transform-templates b/scripts/transform-templates
index 96bf82989..e84052f14 100755
--- a/scripts/transform-templates
+++ b/scripts/transform-templates
@@ -2,7 +2,8 @@
 
 use strict;
 
-our $cond = 1;
+our $cond     = 1;
+our $condDone = 0;
 our %args;
 for ( my $i = 0 ; $i < @ARGV ; $i += 2 ) {
     $args{ $ARGV[$i] } =
@@ -11,13 +12,20 @@ for ( my $i = 0 ; $i < @ARGV ; $i += 2 ) {
 
 while (<STDIN>) {
     if (m#//if:(\w+)#) {
-        $cond = $args{$1};
+        $cond     = $args{$1};
+        $condDone = $cond;
     }
-    elsif (m#//elsif:(\w+)# and not $cond) {
-        $cond = $args{$1};
+    elsif (m#//elsif:(\w+)#) {
+        if ($condDone) {
+            $cond = 0;
+        }
+        else {
+            $cond = $args{$1};
+            $condDone ||= $cond;
+        }
     }
     elsif (m#//else#) {
-        $cond = !$cond;
+        $cond = !$condDone;
     }
     elsif (m#//endif#) {
         $cond = 1;