Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 21:17:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge with james repo

Browse source
This commit is contained in:
elisa-lj11 2016-08-30 15:07:01 -07:00
commit aceddb0cf8
5 changed files with 54 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/Marketplaces.qml
View file

@ -90,8 +90,7 @@ Rectangle {
width: 150
text: "See all markets"
//onClicked: webview.url = "file:///E:/GitHub/hifi/scripts/system/html/marketplaces.html"
//hello again
onClicked: webview.url = "../../../scripts/system/html/marketplaces.html"
onClicked: webview.url = "../../scripts/system/html/marketplaces.html"
}
Controls.Label {

BIN
scripts/system/html/img/clara-tile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
scripts/system/html/img/hifi-marketplace-tile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.7 KiB

6
scripts/system/html/js/marketplaces.js
View file

@ -1,12 +1,12 @@
function loaded() {
bindExploreButtons();
bindExploreButtons();
}
function bindExploreButtons() {
$('#exploreClaraMarketplace').on('click', function () {
$('#exploreClaraMarketplace').on('click', function() {
window.location = "https://clara.io/library?public=true"
})
$('#exploreHifiMarketplace').on('click', function () {
$('#exploreHifiMarketplace').on('click', function() {
window.location = "http://www.highfidelity.com/marketplace"
})
}

11
scripts/system/html/marketplaces.html
View file

@ -7,7 +7,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-->
<html>
<head>
<head>
<title>Marketplaces</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<link rel="stylesheet" type="text/css" href="css/edit-style.css">
@ -16,8 +16,8 @@
<script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
<script type="text/javascript" src="js/eventBridgeLoader.js"></script>
<script src="js/marketplaces.js"></script>
</head>
<body onload='loaded();'>
</head>
<body onload='loaded();'>
<div class="marketplaces-container">
<h2 class="marketplaces-title">
Marketplaces
@ -34,8 +34,7 @@
<div class="marketplace-tile-second-column">
<p class="marketplace-tile-description">This is the default High Fidelity marketplace. Viewing and downloading content from here is fully supported in Interface.</p>
<div class="exploreButton-holder">
<input class="blue exploreButton" type="button" value="Explore" id="exploreHifiMarketplace"></input>
</div>
<input class="blue exploreButton" type="button" value="Explore" id="exploreHifiMarketplace"></input></div>
</div>
<hr class="tile-divider">
</div>
@ -62,5 +61,5 @@
</div>
</body>
</body>
</html>