diff --git a/interface/resources/qml/Marketplaces.qml b/interface/resources/qml/Marketplaces.qml index 9d1b68653c..b03b4b0840 100644 --- a/interface/resources/qml/Marketplaces.qml +++ b/interface/resources/qml/Marketplaces.qml @@ -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 { diff --git a/scripts/system/html/img/clara-tile.png b/scripts/system/html/img/clara-tile.png new file mode 100644 index 0000000000..ae431dd510 Binary files /dev/null and b/scripts/system/html/img/clara-tile.png differ diff --git a/scripts/system/html/img/hifi-marketplace-tile.png b/scripts/system/html/img/hifi-marketplace-tile.png new file mode 100644 index 0000000000..9a95c081a0 Binary files /dev/null and b/scripts/system/html/img/hifi-marketplace-tile.png differ diff --git a/scripts/system/html/js/marketplaces.js b/scripts/system/html/js/marketplaces.js index 5f309aca00..a1b3847b3c 100644 --- a/scripts/system/html/js/marketplaces.js +++ b/scripts/system/html/js/marketplaces.js @@ -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" }) } \ No newline at end of file diff --git a/scripts/system/html/marketplaces.html b/scripts/system/html/marketplaces.html index dc7c57761f..ea85c7ec62 100644 --- a/scripts/system/html/marketplaces.html +++ b/scripts/system/html/marketplaces.html @@ -7,60 +7,59 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html --> - - Marketplaces - - - - - - - - - -
-

+ + Marketplaces + + + + + + + + + +
+

Marketplaces -

-
-

- You can bring content into High Fidelity forom anywhere you want. Here are a few places that support direct import of content right now. If you'd like to suggest a Market to include here, let us know. -

-
-
-
- +

+
+

+ You can bring content into High Fidelity forom anywhere you want. Here are a few places that support direct import of content right now. If you'd like to suggest a Market to include here, let us know. +

-
-

This is the default High Fidelity marketplace. Viewing and downloading content from here is fully supported in Interface.

-
- +
+
+ +
+
+

This is the default High Fidelity marketplace. Viewing and downloading content from here is fully supported in Interface.

+
+
+
+
+
+
+
+ +
+
+

Clara.io has thousands of models available for importing into High Fidelity. Follow these steps for the best experience:

+
    +
  1. Create an account here or log in as an existing user.
    2. +
  2. Choose a model from the list and click Download -> Autodesk FBX.
    3. +
  3. After the file processes, click Download.
    4. +
  4. Add the model to your asset server, then find it from the list and choose Add To World.
    5. +
+
+ +
+
+
-
+ + +
-
-
- -
-
-

Clara.io has thousands of models available for importing into High Fidelity. Follow these steps for the best experience:

-
    -
  1. Create an account here or log in as an existing user.
    2. -
  2. Choose a model from the list and click Download -> Autodesk FBX.
    3. -
  3. After the file processes, click Download.
    4. -
  4. Add the model to your asset server, then find it from the list and choose Add To World.
    5. -
-
- -
-
-
-
-
- - - - - + \ No newline at end of file