fixing some issues in the andriod analytics carbon apps.

revert-dabc3590
sinthuja 8 years ago
parent f3fc531a53
commit d3d176ebdc

@ -31,7 +31,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -31,7 +31,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -31,7 +31,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -33,7 +33,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -33,7 +33,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -31,7 +31,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -31,7 +31,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -32,7 +32,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -50,7 +50,7 @@
<script src="../commons/js/d3.min.js"></script> <script src="../commons/js/d3.min.js"></script>
<script src="../commons/js/vega.js"></script> <script src="../commons/js/vega.js"></script>
<!-- <!--
<script src="../commons/js/VizGrammar.min.js"></script> <script src="../commons/js/VizGrammar_2.js"></script>
<script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script> <script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script>
<script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script> <script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script>
--> -->
@ -58,7 +58,7 @@
<!-- JS --> <!-- JS -->
<script src="js/topojson.js"></script> <script src="js/topojson.js"></script>
<script src="js/vega.js"></script> <script src="js/vega.js"></script>
<script src="js/VizGrammar.min.js"></script> <script src="js/VizGrammar_2.js"></script>
<script src="js/VizGrammarSettings.js"></script> <script src="js/VizGrammarSettings.js"></script>
<script src="js/gadgetconf.js"></script> <script src="js/gadgetconf.js"></script>
<script src="js/analyticsUtils.js"></script> <script src="js/analyticsUtils.js"></script>

@ -46,7 +46,7 @@
<!-- Include VizGrammar --> <!-- Include VizGrammar -->
<script src="../commons/js/d3.min.js"></script> <script src="../commons/js/d3.min.js"></script>
<script src="../commons/js/vega.js"></script> <script src="../commons/js/vega.js"></script>
<script src="../commons/js/VizGrammar.min.js"></script> <script src="../commons/js/VizGrammar_2.js"></script>
<script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script> <script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script>
<script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script> <script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script>

@ -35,7 +35,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -31,7 +31,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -35,7 +35,7 @@
<script src="js/provider-libs/ws-client.js"></script> <script src="js/provider-libs/ws-client.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/d3.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/d3.min.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>

@ -50,7 +50,7 @@
<!-- Include VizGrammar --> <!-- Include VizGrammar -->
<script src="../commons/js/d3.min.js"></script> <script src="../commons/js/d3.min.js"></script>
<script src="../commons/js/vega.js"></script> <script src="../commons/js/vega.js"></script>
<script src="../commons/js/VizGrammar.min.js"></script> <script src="../commons/js/VizGrammar_2.js"></script>
<script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script> <script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script>
<script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script> <script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script>

@ -4,11 +4,11 @@
<Require feature="dynamic-height"/> <Require feature="dynamic-height"/>
<Require feature="wso2-gadgets-identity"/> <Require feature="wso2-gadgets-identity"/>
</ModulePrefs> </ModulePrefs>
<UserPref name="windowSize" <UserPref name="windowSize"
display_name="Window Size" display_name="Window Size"
default_value="10"/> default_value="10"/>
<Content type="html"> <Content type="html">
<![CDATA[ <![CDATA[
<head> <head>
@ -37,13 +37,13 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/gadget-utils.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/iot-gadget-utils.js"></script>
<!-- chart specific vendor libs --> <!-- chart specific vendor libs -->

@ -4,11 +4,11 @@
<Require feature="dynamic-height"/> <Require feature="dynamic-height"/>
<Require feature="wso2-gadgets-identity"/> <Require feature="wso2-gadgets-identity"/>
</ModulePrefs> </ModulePrefs>
<UserPref name="windowSize" <UserPref name="windowSize"
display_name="Window Size" display_name="Window Size"
default_value="10"/> default_value="10"/>
<Content type="html"> <Content type="html">
<![CDATA[ <![CDATA[
<head> <head>
@ -37,12 +37,14 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/iot-gadget-utils.js"></script>
<!-- chart specific vendor libs --> <!-- chart specific vendor libs -->
<!-- chart specific js --> <!-- chart specific js -->

@ -4,11 +4,11 @@
<Require feature="dynamic-height"/> <Require feature="dynamic-height"/>
<Require feature="wso2-gadgets-identity"/> <Require feature="wso2-gadgets-identity"/>
</ModulePrefs> </ModulePrefs>
<UserPref name="windowSize" <UserPref name="windowSize"
display_name="Window Size" display_name="Window Size"
default_value="10"/> default_value="10"/>
<Content type="html"> <Content type="html">
<![CDATA[ <![CDATA[
<head> <head>
@ -37,13 +37,14 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/iot-gadget-utils.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/gadget-utils.js"></script>
<!-- chart specific vendor libs --> <!-- chart specific vendor libs -->

@ -4,11 +4,11 @@
<Require feature="dynamic-height"/> <Require feature="dynamic-height"/>
<Require feature="wso2-gadgets-identity"/> <Require feature="wso2-gadgets-identity"/>
</ModulePrefs> </ModulePrefs>
<UserPref name="windowSize" <UserPref name="windowSize"
display_name="Window Size" display_name="Window Size"
default_value="10"/> default_value="10"/>
<Content type="html"> <Content type="html">
<![CDATA[ <![CDATA[
<head> <head>
@ -37,7 +37,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -4,11 +4,11 @@
<Require feature="dynamic-height"/> <Require feature="dynamic-height"/>
<Require feature="wso2-gadgets-identity"/> <Require feature="wso2-gadgets-identity"/>
</ModulePrefs> </ModulePrefs>
<UserPref name="windowSize" <UserPref name="windowSize"
display_name="Window Size" display_name="Window Size"
default_value="10"/> default_value="10"/>
<Content type="html"> <Content type="html">
<![CDATA[ <![CDATA[
<head> <head>
@ -37,12 +37,14 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/iot-gadget-utils.js"></script>
<!-- chart specific vendor libs --> <!-- chart specific vendor libs -->
<!-- chart specific js --> <!-- chart specific js -->

@ -4,11 +4,11 @@
<Require feature="dynamic-height"/> <Require feature="dynamic-height"/>
<Require feature="wso2-gadgets-identity"/> <Require feature="wso2-gadgets-identity"/>
</ModulePrefs> </ModulePrefs>
<UserPref name="windowSize" <UserPref name="windowSize"
display_name="Window Size" display_name="Window Size"
default_value="10"/> default_value="10"/>
<Content type="html"> <Content type="html">
<![CDATA[ <![CDATA[
<head> <head>
@ -37,11 +37,11 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/gadget-utils.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/iot-gadget-utils.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>

@ -31,7 +31,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -31,7 +31,7 @@
<script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
<script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script> <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>

@ -46,7 +46,7 @@
<!-- Include VizGrammar --> <!-- Include VizGrammar -->
<script src="../commons/js/d3.min.js"></script> <script src="../commons/js/d3.min.js"></script>
<script src="../commons/js/vega.js"></script> <script src="../commons/js/vega.js"></script>
<script src="../commons/js/VizGrammar.min.js"></script> <script src="../commons/js/VizGrammar_2.js"></script>
<script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script> <script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script>
<script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script> <script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script>

Loading…
Cancel
Save