Skip to content

Commit 7e64ea8

Browse files
changes to display themes
1 parent 2353936 commit 7e64ea8

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

frontend/express/app.js

-2
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,6 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
867867
function renderDashboard(req, res, next, member, adminOfApps, userOfApps, countlyGlobalApps, countlyGlobalAdminApps) {
868868
var configs = plugins.getConfig("frontend", member.settings);
869869
configs.export_limit = plugins.getConfig("api").export_limit;
870-
log.e(JSON.stringify(configs));
871870
app.loadThemeFiles(configs.theme, function(theme) {
872871
if (configs._user.theme) {
873872
res.cookie("theme", configs.theme);
@@ -964,7 +963,6 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
964963
stylesheets: [],
965964
offline_mode: configs.offline_mode || false
966965
};
967-
log.e(JSON.stringify(theme));
968966
// google services cannot work when offline mode enable
969967
if (toDashboard.offline_mode) {
970968
toDashboard.use_google = false;

frontend/express/views/dashboard.html

-3
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@
133133
<script language="javascript" type="text/javascript" src="<%- cdn %>javascripts/utils/countly.checkbox.js?<%= countlyVersion %>"></script>
134134
<script language="javascript" type="text/javascript" src="<%- cdn %>javascripts/countly/countly.auth.js?<%= countlyVersion %>"></script>
135135
<% } %>
136-
<script>
137-
console.log(<%themeFiles%>);
138-
</script>
139136

140137
<% if (themeFiles && themeFiles.css) { %>
141138
<% for(var i=0, l=themeFiles.css.length; i<l; i++) {%>

plugins/plugins/frontend/public/javascripts/countly.models.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*global countlyCommon,jQuery,countlyGlobal */
1+
/*global countlyCommon,jQuery,countlyGlobal,CV */
22
(function(countlyPlugins, $) {
33

44
//Private Properties
@@ -255,9 +255,10 @@
255255

256256
countlyPlugins.getThemeList = function() {
257257
var themeList = [];
258-
for(var theme in _themeList){
259-
if(_themeList[theme]){
260-
themeList.push({value: theme, label: _themeList[theme]});
258+
themeList.push({value: "", label: CV.i18n("configs.no-theme")});
259+
for (var theme in _themeList) {
260+
if (_themeList[theme]) {
261+
themeList.push({value: _themeList[theme], label: _themeList[theme]});
261262
}
262263
}
263264
return themeList;

0 commit comments

Comments
 (0)