Skip to content

Commit

Permalink
Allow phoenix to run in a sub folder
Browse files Browse the repository at this point in the history
  • Loading branch information
DeepDiver1975 committed Mar 26, 2018
1 parent 8c0e1b6 commit 0df5c77
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title v-text="pageTitle">ownCloud Phoenix</title>
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="/core/uikit/dist/css/uikit.owncloud.css" />
<link rel="stylesheet" href="core/uikit/dist/css/uikit.owncloud.css" />
</head>
<body>
<!-- primary menu container -->
Expand All @@ -25,7 +25,7 @@
<div class="uk-position-center">
<div id="oc-logo-main" class="uk-flex uk-flex-middle" onClick="document.location.href='/'">
<div class="uk-width-1-2 uk-text-right">
<img src="/core/gfx/cloud-logo-invert.svg" alt="ownCloud" height="45" width="80">
<img src="core/gfx/cloud-logo-invert.svg" alt="ownCloud" height="45" width="80">
</div>
<span class="uk-width-1-2 uk-text-left uk-text-inverse">ownCloud</span>
</div>
Expand Down Expand Up @@ -107,7 +107,7 @@
</div>
</main>

<script src="/core/uikit/dist/js/uikit.min.js"></script>
<script src="/core/js/core.bundle.js" defer></script>
<script src="core/uikit/dist/js/uikit.min.js"></script>
<script src="core/js/core.bundle.js" defer></script>
</body>
</html>
4 changes: 2 additions & 2 deletions src/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const ocHead = new Vue({

getAppConfig () {
return new Promise((resolve, reject) => {
this._readPackage(`/apps/${this.getApp()}/package.json`).then((app) => {
this._readPackage(`apps/${this.getApp()}/package.json`).then((app) => {
this.app = {
name : app.name,
title : app.title,
Expand Down Expand Up @@ -126,7 +126,7 @@ const ocHead = new Vue({
_loadAppAssets() {

let $main = $('<script>', {
"src" : `/apps/${this.app.name}/${this.app.assets.js}`,
"src" : `apps/${this.app.name}/${this.app.assets.js}`,
"defer" : true
});

Expand Down

0 comments on commit 0df5c77

Please sign in to comment.