From b825fcf2e728437fcf0b176c6dd648fd9309d477 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mon, 6 Apr 2015 18:07:34 +0000
Subject: [PATCH] Give fedmenu-staging its own dir.

---
 .../fedmenu => fedmenu-staging}/css/fedmenu.css  |   0
 .../fonts/montserrat.ttf                         | Bin
 .../fedmenu => fedmenu-staging}/img/logo.png     | Bin
 .../img/panda-wave.png                           | Bin
 .../fedmenu => fedmenu-staging}/js/fedmenu.js    |   2 +-
 .../js/fedora-libravatar.js                      |   0
 .../js/jquery-1.11.2.min.js                      |   0
 roles/apps-fp-o/tasks/main.yml                   |  15 +++++++++++++--
 8 files changed, 14 insertions(+), 3 deletions(-)
 rename roles/apps-fp-o/files/{global/fedmenu => fedmenu-staging}/css/fedmenu.css (100%)
 rename roles/apps-fp-o/files/{global/fedmenu => fedmenu-staging}/fonts/montserrat.ttf (100%)
 rename roles/apps-fp-o/files/{global/fedmenu => fedmenu-staging}/img/logo.png (100%)
 rename roles/apps-fp-o/files/{global/fedmenu => fedmenu-staging}/img/panda-wave.png (100%)
 rename roles/apps-fp-o/files/{global/fedmenu => fedmenu-staging}/js/fedmenu.js (98%)
 rename roles/apps-fp-o/files/{global/fedmenu => fedmenu-staging}/js/fedora-libravatar.js (100%)
 rename roles/apps-fp-o/files/{global/fedmenu => fedmenu-staging}/js/jquery-1.11.2.min.js (100%)

diff --git a/roles/apps-fp-o/files/global/fedmenu/css/fedmenu.css b/roles/apps-fp-o/files/fedmenu-staging/css/fedmenu.css
similarity index 100%
rename from roles/apps-fp-o/files/global/fedmenu/css/fedmenu.css
rename to roles/apps-fp-o/files/fedmenu-staging/css/fedmenu.css
diff --git a/roles/apps-fp-o/files/global/fedmenu/fonts/montserrat.ttf b/roles/apps-fp-o/files/fedmenu-staging/fonts/montserrat.ttf
similarity index 100%
rename from roles/apps-fp-o/files/global/fedmenu/fonts/montserrat.ttf
rename to roles/apps-fp-o/files/fedmenu-staging/fonts/montserrat.ttf
diff --git a/roles/apps-fp-o/files/global/fedmenu/img/logo.png b/roles/apps-fp-o/files/fedmenu-staging/img/logo.png
similarity index 100%
rename from roles/apps-fp-o/files/global/fedmenu/img/logo.png
rename to roles/apps-fp-o/files/fedmenu-staging/img/logo.png
diff --git a/roles/apps-fp-o/files/global/fedmenu/img/panda-wave.png b/roles/apps-fp-o/files/fedmenu-staging/img/panda-wave.png
similarity index 100%
rename from roles/apps-fp-o/files/global/fedmenu/img/panda-wave.png
rename to roles/apps-fp-o/files/fedmenu-staging/img/panda-wave.png
diff --git a/roles/apps-fp-o/files/global/fedmenu/js/fedmenu.js b/roles/apps-fp-o/files/fedmenu-staging/js/fedmenu.js
similarity index 98%
rename from roles/apps-fp-o/files/global/fedmenu/js/fedmenu.js
rename to roles/apps-fp-o/files/fedmenu-staging/js/fedmenu.js
index 4666b8730c..71d5135602 100644
--- a/roles/apps-fp-o/files/global/fedmenu/js/fedmenu.js
+++ b/roles/apps-fp-o/files/fedmenu-staging/js/fedmenu.js
@@ -16,7 +16,7 @@ var fedmenu = function(options) { $(document).ready(function() {
     if (o['package'] != null) buttons += '<div id="fedmenu-package-button" class="fedmenu-button"><div class="img"></div></div>';
     buttons += '<div id="fedmenu-main-button" class="fedmenu-button"><div class="img"></div></div>';
 
-    $('body').append('<link href="fedmenu.css" rel="stylesheet">');
+    $('body').append('<link href="https://apps.stg.fedoraproject.org/fedmenu/css/fedmenu.css" rel="stylesheet">');
     $('body').append(
         '<div id="fedmenu-tray" class="fedmenu-' + o.position + '">' +
         buttons + '</div>');
diff --git a/roles/apps-fp-o/files/global/fedmenu/js/fedora-libravatar.js b/roles/apps-fp-o/files/fedmenu-staging/js/fedora-libravatar.js
similarity index 100%
rename from roles/apps-fp-o/files/global/fedmenu/js/fedora-libravatar.js
rename to roles/apps-fp-o/files/fedmenu-staging/js/fedora-libravatar.js
diff --git a/roles/apps-fp-o/files/global/fedmenu/js/jquery-1.11.2.min.js b/roles/apps-fp-o/files/fedmenu-staging/js/jquery-1.11.2.min.js
similarity index 100%
rename from roles/apps-fp-o/files/global/fedmenu/js/jquery-1.11.2.min.js
rename to roles/apps-fp-o/files/fedmenu-staging/js/jquery-1.11.2.min.js
diff --git a/roles/apps-fp-o/tasks/main.yml b/roles/apps-fp-o/tasks/main.yml
index 9b1644750b..505fe4e2c4 100644
--- a/roles/apps-fp-o/tasks/main.yml
+++ b/roles/apps-fp-o/tasks/main.yml
@@ -13,11 +13,22 @@
   - apps-fp-o
 
 - name: Copy in some global assets used around our apps
-  synchronize: >
-    src=global/ dest=/srv/web/apps-fp-o/global/
+  synchronize: src=global/ dest=/srv/web/apps-fp-o/global/
   tags:
   - apps-fp-o
 
+- name: Copy in fedmenu assets for staging
+  synchronize: src=fedmenu-staging/ dest=/srv/web/apps-fp-o/fedmenu/
+  when: environment == 'staging'
+  tags:
+  - apps-fp-o
+
+#- name: Copy in fedmenu assets for production
+#  synchronize: src=fedmenu/ dest=/srv/web/apps-fp-o/fedmenu/
+#  when: environment != 'staging'
+#  tags:
+#  - apps-fp-o
+
 - name: Copy in our app data yaml
   file: >
     src=apps.yaml dest=/usr/share/apps-fp-o/apps.yaml