Merge pull request #3242 from Countly/abhishek/themes

[SER-140] [SER-103] Changes for rtl theme

Author: ar2rsawseen

frontend/express/app.js

@@ -963,7 +963,6 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
                 stylesheets: [],
                 offline_mode: configs.offline_mode || false
             };
-
             // google services cannot work when offline mode enable
             if (toDashboard.offline_mode) {
                 toDashboard.use_google = false;

frontend/express/public/themes/rtl/theme.css

@@ -0,0 +1,12 @@
+.cly-vue-surveys-preview { direction: rtl; }
+.cly-vue-surveys-preview .close-button { float: left !important; }
+.cly-vue-surveys-preview .header-text { float: right !important; }
+.cly-vue-surveys-preview .submit-wrapper .submit-button { float: left !important; }
+.cly-vue-surveys-preview .submit-wrapper img { float: right !important; }
+.cly-vue-nps-preview { direction: rtl; }
+.cly-vue-nps-preview .close-button { float: left !important; }
+.cly-vue-nps-preview .main-text { float: right !important; }
+.cly-vue-nps-preview .rating-labels .left { float: right !important; }
+.cly-vue-nps-preview .rating-labels .right { float: left !important; }
+.cly-vue-nps-preview .submit-wrapper .submit-button { float: left !important; }
+.cly-vue-nps-preview .submit-wrapper img { float: right !important; }

frontend/express/views/dashboard.html

@@ -133,6 +133,7 @@
         <script language="javascript" type="text/javascript" src="<%- cdn %>javascripts/utils/countly.checkbox.js?<%= countlyVersion %>"></script>
         <script language="javascript" type="text/javascript" src="<%- cdn %>javascripts/countly/countly.auth.js?<%= countlyVersion %>"></script>
     <% } %>
+
     <% if (themeFiles && themeFiles.css) { %>
         <% for(var i=0, l=themeFiles.css.length; i<l; i++) {%>
     <link href='<%= themeFiles.css[i]%>?<%= countlyVersion %>' rel='stylesheet' type='text/css'>

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

@@ -1,4 +1,4 @@
-/*global countlyCommon,jQuery,countlyGlobal */
+/*global countlyCommon,jQuery,countlyGlobal,CV */
 (function(countlyPlugins, $) {
 
     //Private Properties
@@ -254,7 +254,14 @@
     };
 
     countlyPlugins.getThemeList = function() {
-        return _themeList;
+        var themeList = [];
+        themeList.push({value: "", label: CV.i18n("configs.no-theme")});
+        for (var theme in _themeList) {
+            if (_themeList[theme]) {
+                themeList.push({value: _themeList[theme], label: _themeList[theme]});
+            }
+        }
+        return themeList;
     };
 
     countlyPlugins.deleteAccount = function(configs, callback) {

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

@@ -954,8 +954,6 @@
     }
     app.configurationsView.registerInput("apps.country", {input: "el-select", attrs: {}, list: countryList});
 
-    app.configurationsView.registerInput("frontend.theme", {input: "el-select", attrs: {}, list: countlyPlugins.getThemeList()});
-
     app.configurationsView.registerInput("logs.default", {
         input: "el-select",
         attrs: {},
@@ -1094,6 +1092,7 @@
                 }
                 app.addAppManagementInput(key, jQuery.i18n.map['configs.' + key], inputs);
             }
+            app.configurationsView.registerInput("frontend.theme", {input: "el-select", attrs: {}, list: countlyPlugins.getThemeList()});
         });
     }