community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wso2-master' into test-merge

Browse Source 
# Conflicts:
#	README.md
#	pom.xml
merge-requests/1/head
sinthuja 8 years ago
parent 2ce5b0dd74 9b7b1d0d89
commit b1f305aeae
5 changed files with 68 additions and 25 deletions
Show Stats Download Patch File Download Diff File

48
modules-old/core/distribution/src/repository/cloud/portal/global-navigation.jag
Unescape View File

@ -18,16 +18,23 @@
<% <%
var query = request.getQueryString(); var query = request.getQueryString();
var dest = encodeURIComponent(originalURI + (query ? '?' + query : '')); var dest = encodeURIComponent(originalURI + (query ? '?' + query : ''));
var configs = require('/configs/portal.js').config();
var isCloud = configs.isCloud;
%> %>
<header class="header header-default"> <header class="header header-default">
<div class="container-fluid"> <div class="container-fluid">
<div class="pull-left brand float-remove-xs text-center-xs"> <div class="pull-left brand float-remove-xs text-center-xs">
<a href="<%=tenantedUrlPrefix%>./dashboards"> <a href="<%=tenantedUrlPrefix%>./dashboards">
<img src="<%=urlPrefix%>libs/theme-wso2_1.0/images/logo-inverse.svg" alt="WSO2" title="WSO2" class="logo"> <img src="<%=urlPrefix%>libs/theme-wso2_1.0/images/logo-inverse.svg" alt="WSO2" title="WSO2" class="logo">
<% if (isCloud) { %>
<h1>Cloud</h1> <h1>Cloud</h1>
<% } else { %>
<h1><%=i18n.localize("dashboard.server.label")%></h1>
<% } %>
</a> </a>
</div> </div>
<div class="pull-right auth float-remove-xs text-center-xs"> <% if (isCloud) { %>
<div class="pull-right auth float-remove-xs text-center-xs">
<% if (user) { %> <% if (user) { %>
<ul class="nav navbar-right float-remove-xs text-center-xs"> <ul class="nav navbar-right float-remove-xs text-center-xs">
@ -283,7 +290,40 @@ var dest = encodeURIComponent(originalURI + (query ? '?' + query : ''));
</div> </div>
</div> </div>
<% } else { %>
<div class="pull-right auth float-remove-xs text-center-xs">
<% if (user) { %>
<span class="hidden-xs">
<a href="#" class="dropdown" data-toggle="dropdown">
<span class="add-margin-left-2x add-margin-right-1x"><%=user.username%></span>
<span class="fw fw-user add-margin-right-1x"></span>
<span class="caret add-margin-right-2x"></span>
</a>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li class="dropdown-header visible-xs"><%=user.username%> <span class="caret"></span></li>
<li><a href="<%=urlPrefix%>logout?destination=<%=dest%>"><%= i18n.localize("logout.label")%></a></li>
</ul>
</span>
<div class="visible-xs auth-xs">
<a href="#" class="collapsed" data-toggle="collapse" data-target="#auth-menu-items" aria-expanded="false">
<span class="icon fw-stack fw">
<i class="fw fw-user fw-stack-1x"></i>
</span>
<span class="caret"></span>
</a>
<div id="auth-menu-items" class="collapse">
<ul >
<li><%=user.username%></li>
<li><a href="<%=urlPrefix%>logout?destination=<%=dest%>"><%= i18n.localize("logout.label")%></a></li>
</ul>
</div>
</div>
<% } else { %>
<a href="<%=urlPrefix%>login?destination=<%=dest%>" class="dropdown" data-toggle="dropdown">
<%= i18n.localize("login.label")%>
</a>
<% } %>
</div>
<% } %>
</div> </div>
</header> </header>

26
modules-old/core/distribution/src/repository/cloud/portal/portal.js
Unescape View File

@ -149,7 +149,7 @@ $(function () {
var dashboard = findDashboard(id); var dashboard = findDashboard(id);
dashboardEl.html(dashboardThumbnailHbs(dashboard)); dashboardEl.html(dashboardThumbnailHbs(dashboard));
}); });
portal.on('click', '.ues-view:not(.disable)', function(e) { portal.on('click', '.ues-view:not(.disable)', function(e) {
e.preventDefault(); e.preventDefault();
window.open($(this).attr('href'), '_blank'); window.open($(this).attr('href'), '_blank');
@ -185,20 +185,20 @@ $(function () {
}); });
}; };
$(document).ready(function () { $(document).ready(function () {
$('#cloud-menu-popover i.fw-tiles').popover({ if($('#cloud-menu-popover').length) {
html: true, $('#cloud-menu-popover i.fw-tiles').popover({
trigger:'click', html: true,
title: function() { trigger:'click',
return $("#popover-head").html(); title: function() {
}, return $("#popover-head").html();
content: function() { },
return $("#popover-content").html(); content: function() {
} return $("#popover-content").html();
}); }
});
}
}); });
initUI(); initUI();
loadDashboards(); loadDashboards();
}); });

2
modules-old/core/distribution/src/repository/conf/log4j.properties
Unescape View File

@ -59,6 +59,8 @@ log4j.logger.de.hunsicker.jalopy.io=FATAL
#log4j.logger.org.apache.synapse.transport.http.headers=DEBUG #log4j.logger.org.apache.synapse.transport.http.headers=DEBUG
#log4j.logger.org.apache.synapse.transport.http.wire=DEBUG #log4j.logger.org.apache.synapse.transport.http.wire=DEBUG
# uncomment the following logs to see http calls headers and messages
#log4j.logger.feign=DEBUG
#only WARN allowed for access loggers in http transport by default #only WARN allowed for access loggers in http transport by default
log4j.logger.org.apache.synapse.transport.http.access=WARN log4j.logger.org.apache.synapse.transport.http.access=WARN

1
modules-old/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
Unescape View File

@ -1,4 +1,5 @@
{ {
"isCloud" : false,
"store": { "store": {
"types": ["fs"] "types": ["fs"]
}, },

16
modules-old/core/p2-profile-gen/pom.xml
Unescape View File

@ -162,7 +162,7 @@
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version}
@ -959,7 +959,7 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
@ -1909,7 +1909,7 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
@ -2404,7 +2404,7 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
@ -2617,7 +2617,7 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
@ -3062,7 +3062,7 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
@ -3291,7 +3291,7 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
@ -3717,7 +3717,7 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>

Write Preview
Loading…
Cancel
Save