community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0

Browse Source
This commit is contained in:
geethkokila 2017-02-09 20:29:12 +05:30
commit bce1395182
2 changed files with 222 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
View File

@ -1,6 +1,26 @@
{ {
"appContext": "/devicemgt/", "appContext": "/devicemgt/",
"isCloud": false, "isCloud": false,
"cloudConfig": {
"upgradeNowURL": "",
"monetizationURL": "",
"requestExtensionURL": "",
"publisherURL": "",
"storeURL": "",
"contactUsURL": "",
"apiCloudDocURL": "https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation",
"appCloudDocURL": "https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation",
"deviceCloudDocURL": "https://docs.wso2.com/display/DeviceCloud/WSO2+Device+Cloud+Documentation",
"apiCloudWalkthroughURL": "https://api.clouddev.wso2.com/publisher?interactiveTutorial=true",
"profileURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag",
"changePasswordURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag",
"logoutURL": "https://api.clouddev.wso2.com/publisher/site/pages/logout.jag",
"apiCloudURL": "",
"appCloudURL": "",
"deviceCloudURL": "",
"oraganizationURL": "",
"membersURL": ""
},
"httpsURL": "https://%iot.gateway.host%:%iot.gateway.https.port%", "httpsURL": "https://%iot.gateway.host%:%iot.gateway.https.port%",
"httpURL": "http://%iot.gateway.host%:%iot.gateway.http.port", "httpURL": "http://%iot.gateway.host%:%iot.gateway.http.port",
"wssURL": "https://%iot.analytics.host%:%iot.analytics.https.port%", "wssURL": "https://%iot.analytics.host%:%iot.analytics.https.port%",

40
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
View File

@ -48,7 +48,7 @@
<li> <li>
<a title="Upgrade Now" <a title="Upgrade Now"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/payment-plans.jag?cloud-type=device_cloud" href="{{upgradeNowURL}}"
target="_self"> target="_self">
<i class="fw fw-export" title="Upgrade Now"></i> Upgrade Now <i class="fw fw-export" title="Upgrade Now"></i> Upgrade Now
</a> </a>
@ -56,7 +56,7 @@
<li> <li>
<a title="Monetization" <a title="Monetization"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/monetization-dashboard.jag" href="{{monetizationURL}}"
target="_self"> target="_self">
<i class="fa fa-money fa-lg" title="Monetization"></i> Monetization <i class="fa fa-money fa-lg" title="Monetization"></i> Monetization
</a> </a>
@ -64,7 +64,7 @@
<li> <li>
<a title="Request Extension" <a title="Request Extension"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag?cloud-type=device_cloud&amp;request-extension=true" href="{{requestExtensionURL}}"
target="_blank"> target="_blank">
<i class="fw fw-mail" title="Request Extension"></i> Request Extension <i class="fw fw-mail" title="Request Extension"></i> Request Extension
</a> </a>
@ -82,20 +82,20 @@
<span class="hidden-xs"> <span class="hidden-xs">
App Management App Management
</span> </span>
<!--<span class="caret"></span>--> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown" <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
role="menu"> role="menu">
<li class="visible-inline-block"> <li class="visible-inline-block">
<a title="Mobile App Publisher" href="https://devicemgt.clouddev.wso2.com/publisher" <a title="Mobile App Publisher" href="{{publisherURL}}"
target="_self"> target="_self">
<i class="fw fw-user" title="Mobilr App Publisher"></i> App Publisher <i class="fw fw-user" title="Mobilr App Publisher"></i> App Publisher
</a> </a>
</li> </li>
<li class="visible-inline-block"> <li class="visible-inline-block">
<a title="App Store " href="https://devicemgt.clouddev.wso2.com/store" <a title="App Store " href="{{storeURL}}"
target="_self"> target="_self">
<i class="fw fw-store" title="App Store"></i> App Store <i class="fw fw-store" title="App Store"></i> App Store
</a> </a>
@ -105,7 +105,7 @@
</li> </li>
<li class="visible-inline-block"> <li class="visible-inline-block">
<a href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag" target="_self" <a href="{{contactUsURL}}" target="_self"
title="Support"> title="Support">
@ -136,7 +136,7 @@
<li> <li>
<a title="API Cloud" <a title="API Cloud"
href="https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation" href="{{apiCloudDocURL}}"
target="_blank"> target="_blank">
<i class="fw fw-api" title="API Cloud"></i> API Cloud <i class="fw fw-api" title="API Cloud"></i> API Cloud
</a> </a>
@ -144,15 +144,15 @@
<li> <li>
<a title="App Cloud" <a title="App Cloud"
href="https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation" href="{{appCloudDocURL}}"
target="_blank"> target="_blank">
<i class="fw fw-application" title="App Cloud"></i> App Cloud <i class="fw fw-application" title="App Cloud"></i> App Cloud
</a> </a>
</li> </li>
<li> <li>
<a title="App Cloud" <a title="Device Cloud"
href="https://docs.wso2.com/display/AppCloud/WSO2+Device+Cloud+Documentation" href="{{deviceCloudDocURL}}"
target="_blank"> target="_blank">
<i class="fw fw-application" title="App Cloud"></i> Device Cloud <i class="fw fw-application" title="App Cloud"></i> Device Cloud
</a> </a>
@ -160,7 +160,7 @@
<li> <li>
<a title="API Cloud Walkthrough" <a title="API Cloud Walkthrough"
href="https://api.clouddev.wso2.com/publisher?interactiveTutorial=true" href="{{apiCloudWalkthroughURL}}"
target="_self"> target="_self">
<i class="fw fw-document" title="API Cloud Walkthrough"></i> API Cloud Walkthrough <i class="fw fw-document" title="API Cloud Walkthrough"></i> API Cloud Walkthrough
</a> </a>
@ -187,7 +187,7 @@
<li> <li>
<a title="Profile" <a title="Profile"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag" href="{{profileURL}}"
target="_self"> target="_self">
<i class="fw fw-user" title="Profile"></i> Profile <i class="fw fw-user" title="Profile"></i> Profile
</a> </a>
@ -195,14 +195,14 @@
<li> <li>
<a title="Change Password" <a title="Change Password"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag" href="{{changePasswordURL}}"
target="_self"> target="_self">
<i class="fw fw-lock" title="Change Password"></i> Change Password <i class="fw fw-lock" title="Change Password"></i> Change Password
</a> </a>
</li> </li>
<li> <li>
<a title="Logout" href="https://api.clouddev.wso2.com/publisher/site/pages/logout.jag" <a title="Logout" href="{{logoutURL}}"
target="_self"> target="_self">
<i class="fw fw-sign-out" title="Logout"></i> Logout <i class="fw fw-sign-out" title="Logout"></i> Logout
</a> </a>
@ -229,17 +229,17 @@
<div id="popover-content" class="hide"> <div id="popover-content" class="hide">
<div class="cloud-apps"> <div class="cloud-apps">
<a href="https://api.cloud.wso2.com/publisher" target="_self" class="cloud-block add-padding-top-3x"> <a href="{{apiCloudURL}}https://api.cloud.wso2.com/publisher" target="_self" class="cloud-block add-padding-top-3x">
<i class="fw fw-api fw-3x"></i> <i class="fw fw-api fw-3x"></i>
<div class="cloud-name">API Cloud</div> <div class="cloud-name">API Cloud</div>
</a> </a>
<a href="https://apps.cloud.wso2.com/appmgt" target="_self" class="cloud-block add-padding-top-3x"> <a href="{{appCloudURL}}https://apps.cloud.wso2.com/appmgt" target="_self" class="cloud-block add-padding-top-3x">
<i class="fw fw-application fw-3x"></i> <i class="fw fw-application fw-3x"></i>
<div class="cloud-name">App Cloud</div> <div class="cloud-name">App Cloud</div>
</a> </a>
<a href="https://devicemgt.cloud.wso2.com/devicemgt" target="_self" class="cloud-block add-padding-top-3x"> <a href="{{deviceCloudURL}}https://devicemgt.cloud.wso2.com/devicemgt" target="_self" class="cloud-block add-padding-top-3x">
<i class="fw fw-mobile fw-3x"></i> <i class="fw fw-mobile fw-3x"></i>
<div class="cloud-name">Device Cloud</div> <div class="cloud-name">Device Cloud</div>
</a> </a>
@ -249,12 +249,12 @@
<div class="cloud-actions"> <div class="cloud-actions">
<h3>Manage your cloud</h3> <h3>Manage your cloud</h3>
<a href="https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/organization.jag" target="_self" class="cloud-block-invert add-padding-top-3x"> <a href="{{oraganizationURL}}https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/organization.jag" target="_self" class="cloud-block-invert add-padding-top-3x">
<i class="fw fw-organization fw-3x"></i> <i class="fw fw-organization fw-3x"></i>
<div class="cloud-name">Organization</div> <div class="cloud-name">Organization</div>
</a> </a>
<a href="https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/user.jag" target="_self" class="cloud-block-invert add-padding-top-3x"> <a href="{{membersURL}}https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/user.jag" target="_self" class="cloud-block-invert add-padding-top-3x">
<i class="fa fa-users fa-3x"></i> <i class="fa fa-users fa-3x"></i>
<div class="cloud-name">Members</div> <div class="cloud-name">Members</div>
</a> </a>