Merge pull request #393 from xiaodoudou/master

Bugfix: add missing baseURL inside templates and dashboard config
MicrosoftDX · Jan 19, 2017 · 75e6110 · 75e6110
2 parents d939f99 + 4c58030
commit 75e6110
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Server/public/javascripts/dashboard-config.js b/Server/public/javascripts/dashboard-config.js
@@ -14,7 +14,7 @@ $.get(VORLON.DashboardManager.CatalogUrl, function(data) {
             folder: data[plugin].foldername
         }
 
-        $('.plugins-list').append('<li class="plugin-'+tmp.id+'" data-id="'+tmp.id+'"><div class="calque"></div><h4><img src="'+VORLON.DashboardManager.vorlonBaseURL+'/getplugin/'+tmp.folder+'/icon" alt="icon"> <input data-id="'+tmp.id+'" type="text" value="'+tmp.name+'"> <span>'+tmp.name+' </span><i class="fa fa-pencil"></i></h4><img src="images/nodejs.png" title="'+tmp.nodeText+'" data-placement="top" alt="nodeCompliant" class="'+tmp.nodeClass+' nodeCompliant"><div class="panel_option"><label for="panel_select">Panel</label><select data-id="'+tmp.id+'" id="panel_select" class="panel_select"><option '+tmp.selectedTop+' value="top">Top</option><option value="bottom" '+tmp.selectedBottom+'>Bottom</option></select></div><div class="state_option"><label>State<input id="cb-'+tmp.id+'" '+tmp.checked+' type="checkbox" class="tgl tgl-skewed" data-id="'+tmp.id+'"><label data-tg-off="OFF" data-tg-on="ON" for="cb-'+tmp.id+'" class="tgl-btn"></label></label></div><i class="fa fa-arrows" aria-hidden="true"></i></li>');
+        $('.plugins-list').append('<li class="plugin-'+tmp.id+'" data-id="'+tmp.id+'"><div class="calque"></div><h4><img src="'+VORLON.DashboardManager.vorlonBaseURL+'/getplugin/'+tmp.folder+'/icon" alt="icon"> <input data-id="'+tmp.id+'" type="text" value="'+tmp.name+'"> <span>'+tmp.name+' </span><i class="fa fa-pencil"></i></h4><img src="'+VORLON.DashboardManager.vorlonBaseURL+'/images/nodejs.png" title="'+tmp.nodeText+'" data-placement="top" alt="nodeCompliant" class="'+tmp.nodeClass+' nodeCompliant"><div class="panel_option"><label for="panel_select">Panel</label><select data-id="'+tmp.id+'" id="panel_select" class="panel_select"><option '+tmp.selectedTop+' value="top">Top</option><option value="bottom" '+tmp.selectedBottom+'>Bottom</option></select></div><div class="state_option"><label>State<input id="cb-'+tmp.id+'" '+tmp.checked+' type="checkbox" class="tgl tgl-skewed" data-id="'+tmp.id+'"><label data-tg-off="OFF" data-tg-on="ON" for="cb-'+tmp.id+'" class="tgl-btn"></label></label></div><i class="fa fa-arrows" aria-hidden="true"></i></li>');
 
         $(document).tooltip({
             position: {
@@ -125,4 +125,4 @@ $(".search-config input").keydown(function (e) {
     if(e.which == 13 || e.which == 27) {
         $('.config-wrapper .fa-search').trigger('click');
     }
-});
+});
diff --git a/Server/views/httpproxy.jade b/Server/views/httpproxy.jade
@@ -15,7 +15,7 @@ html(lang='en')
 
   div.home
     div.top
-      img.logo(src="/images/VorlonLogo_Smooth.svg", alt="Vorlon logo" )
+      img.logo(src=baseURL + "/images/VorlonLogo_Smooth.svg", alt="Vorlon logo" )
     div.form
       div.message Vorlon proxy allows you to use Vorlon on an existing website. Just enter the website url, and click on the button. Couldn't be easier !
       div.input

diff --git a/Server/views/httpproxyerror.jade b/Server/views/httpproxyerror.jade
@@ -15,6 +15,6 @@ html(lang='en')
 
   div.home
     div.top
-      img.logo(src="/images/VorlonLogo_Smooth.svg", alt="Vorlon logo" )
+      img.logo(src=baseURL + "/images/VorlonLogo_Smooth.svg", alt="Vorlon logo" )
     div.form
-      div.message error
+      div.message error
diff --git a/Server/views/includes/dashboard-config.jade b/Server/views/includes/dashboard-config.jade
@@ -1,12 +1,12 @@
 section.dashboard-initial
   section.config-wrapper
     h2.plugin-title  
-      img.machine(src="images/machine.png")
+      img.machine(src=baseURL + "/images/machine.png")
       span Plugins available <em>(<span class="countPlugins">0</span>)</em> :
       div.search-config  
         i.fa.fa-search
         input(type="text")
     div.plugins-list-wrapper    
       ul.plugins-list
       div.clear
-    div.clear
+    div.clear