Skip to content

Commit a421a78

Browse files
authored
Merge pull request #778 from frknbasaran/version-info
[version-info] added more configuration options to version.info file.
2 parents 47f10bd + f8105d6 commit a421a78

File tree

2 files changed

+36
-10
lines changed

2 files changed

+36
-10
lines changed

frontend/express/app.js

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ var versionInfo = require('./version.info'),
66
COUNTLY_TYPE = versionInfo.type,
77
COUNTLY_PAGE = versionInfo.page = (!versionInfo.title) ? "http://count.ly" : null,
88
COUNTLY_NAME = versionInfo.title = versionInfo.title || "Countly",
9+
COUNTLY_DOCUMENTATION_LINK = (typeof versionInfo.documentationLink === "undefined") ? true : (typeof versionInfo.documentationLink === "string") ? versionInfo.documentationLink : (typeof versionInfo.documentationLink === "boolean") ? versionInfo.documentationLink : true,
10+
COUNTLY_FEEDBACK_LINK = (typeof versionInfo.feedbackLink === "undefined") ? true : (typeof versionInfo.feedbackLink === "string") ? versionInfo.feedbackLink : (typeof versionInfo.feedbackLink === "boolean") ? versionInfo.feedbackLink : true,
911
express = require('express'),
1012
SkinStore = require('connect-mongoskin'),
1113
expose = require('./libs/express-expose.js'),
@@ -807,6 +809,8 @@ function renderDashboard(req, res, next, member, adminOfApps, userOfApps, countl
807809
countlyType: COUNTLY_TYPE_CE,
808810
countlyTrial: COUNTLY_TRIAL,
809811
countlyTypeName: COUNTLY_NAMED_TYPE,
812+
feedbackLink: COUNTLY_FEEDBACK_LINK,
813+
documentationLink: COUNTLY_DOCUMENTATION_LINK,
810814
countlyTypeTrack: COUNTLY_TRACK_TYPE,
811815
production: configs.production || false,
812816
pluginsSHA: sha1Hash(plugins.getPlugins()),

frontend/express/views/dashboard.html

+32-10
Original file line numberDiff line numberDiff line change
@@ -167,18 +167,38 @@
167167
<span data-localize="sidebar.settings"></span>
168168
</a>
169169
<% if (!countlyType) { %>
170-
<% if(intercom && member['global_admin'] || config.autonomous) { %>
171-
<a class="item activate_intercom">
170+
<% if((intercom && member['global_admin'] || config.autonomous) && (typeof feedbackLink === "string")) { %>
171+
<a target="_new" href="<%= feedbackLink %>" class="item">
172172
<i class="ion-android-textsms icon"></i>
173173
<span data-localize="common.feedback-and-support"></span>
174174
</a>
175175
<% } %>
176-
<a class="item" href="http://resources.count.ly/" target="_blank">
177-
<i class="ion-android-document icon"></i>
178-
<span data-localize="common.documentation"></span>
176+
<% if((intercom && member['global_admin'] || config.autonomous) && (typeof feedbackLink === "boolean" && feedbackLink)) { %>
177+
<a class="item activate_intercom">
178+
<i class="ion-android-textsms icon"></i>
179+
<span data-localize="common.feedback-and-support"></span>
179180
</a>
181+
<% } %>
182+
<% if (typeof documentationLink === "string") { %>
183+
<a class="item" href="<%= documentationLink %>" target="_blank">
184+
<i class="ion-android-document icon"></i>
185+
<span data-localize="common.documentation"></span>
186+
</a>
187+
<% } %>
188+
<% if (typeof documentationLink === "boolean" && documentationLink) { %>
189+
<a class="item" href="http://resources.count.ly" target="_blank">
190+
<i class="ion-android-document icon"></i>
191+
<span data-localize="common.documentation"></span>
192+
</a>
193+
<% } %>
180194
<% } else { %>
181-
<% if(intercom && member['global_admin'] || config.autonomous) { %>
195+
<% if((intercom && member['global_admin'] || config.autonomous) && (typeof feedbackLink === "string")) { %>
196+
<a target="_new" href="<% feedbackLink %>" class="item">
197+
<i class="ion-android-textsms icon"></i>
198+
<span data-localize="common.provide-feedback"></span>
199+
</a>
200+
<% } %>
201+
<% if((intercom && member['global_admin'] || config.autonomous) && (typeof feedbackLink === "boolean" && feedbackLink)) { %>
182202
<a class="item activate_intercom">
183203
<i class="ion-android-textsms icon"></i>
184204
<span data-localize="common.provide-feedback"></span>
@@ -188,10 +208,12 @@
188208
<i class="ion-help-buoy icon"></i>
189209
<span data-localize="common.support"></span>
190210
</a>
191-
<a class="item" href="http://resources.count.ly/" target="_blank">
192-
<i class="ion-android-document icon"></i>
193-
<span data-localize="common.documentation"></span>
194-
</a>
211+
<% if (documentationLink) { %>
212+
<a class="item" href="http://resources.count.ly/" target="_blank">
213+
<i class="ion-android-document icon"></i>
214+
<span data-localize="common.documentation"></span>
215+
</a>
216+
<% } %>
195217
<% } %>
196218
<a href="#/manage/token_manager" class="item">
197219
<i class="ion-key icon"></i>

0 commit comments

Comments
 (0)