Merge branch 'develop'

webhook · Sep 5, 2014 · 34dfb5d · 34dfb5d
2 parents fac71cc + 355b8fa
commit 34dfb5d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/app/components/download-backup.js b/app/components/download-backup.js
@@ -5,7 +5,7 @@ export default Ember.Component.extend({
   text: 'Download Backup',
 
   click: function () {
-    var fileName = this.get('buildEnvironment.siteName') + '-' + moment().format() + '.json';
+    var fileName = this.get('buildEnvironment.siteDisplayName') + '-' + moment().format() + '.json';
     window.ENV.firebase.once('value', function (snapshot) {
       var data = snapshot.val();
 

diff --git a/app/controllers/wh/settings/data.js b/app/controllers/wh/settings/data.js
@@ -175,7 +175,7 @@ export default Ember.Controller.extend({
 
     download: function () {
 
-      var fileName = this.get('buildEnvironment.siteName') + '-' + moment().format() + '.json';
+      var fileName = this.get('buildEnvironment.siteDisplayName') + '-' + moment().format() + '.json';
 
       window.ENV.firebase.once('value', function (snapshot) {
         var data = snapshot.val();

diff --git a/app/initializers/environment.js b/app/initializers/environment.js
@@ -80,6 +80,7 @@ export default {
     buildEnv.set('local', isLocal);
     buildEnv.set('localSocket', localSocket);
     buildEnv.set('siteName', siteName);
+    buildEnv.set('siteDisplayName', window.ENV.selfHosted ? siteName.replace('/,1/g', '.') : siteName);
     buildEnv.set('siteUrl', 'http://' + siteName + '.webhook.com/');
     buildEnv.set('building', false);
     buildEnv.set('selfHosted', window.ENV.selfHosted);

diff --git a/app/templates/form/_initialscaffolding.hbs b/app/templates/form/_initialscaffolding.hbs
@@ -5,11 +5,11 @@
   <p>
   {{#if contentType.oneOff}}
     We automatically created a starter template for you. You can find it at
-    <code>/{{buildEnvironment.siteName}}/pages/{{contentType.id}}.html</code>.
+    <code>/{{buildEnvironment.siteDisplayName}}/pages/{{contentType.id}}.html</code>.
     It will teach you the basics of pulling content into your site from the CMS.
   {{else}}
     We automatically created starter templates in your
-    <code>/{{buildEnvironment.siteName}}/templates/{{contentType.id}}/</code>
+    <code>/{{buildEnvironment.siteDisplayName}}/templates/{{contentType.id}}/</code>
     folder. They will teach you the basics of pulling content into your
     site from the CMS.
   {{/if}}