Skip to content

Commit

Permalink
Merge pull request #1017 from eriknelson/static-updates
Browse files Browse the repository at this point in the history
Static updates
  • Loading branch information
eriknelson committed Jul 8, 2016
2 parents c358dfe + 5562a72 commit c90a611
Show file tree
Hide file tree
Showing 29 changed files with 12 additions and 2 deletions.
10 changes: 10 additions & 0 deletions fusor-ember-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ The fuser-ember-cli/dist directory is the [.gitignore](https://github.com/fusor/

The fuser-ember-cli/dist distory is generated automatically by [ember-cli](http://www.ember-cli.com/) when you run `ember server` or `ember build` locally inside the this directory.

Purely static files (those that are not part of the build) should be checked
in under `../ui/public/fusor_ui`. They will be served in both the dev and iso
environments at:

`${HOSTNAME}/fusor_ui/`

i.e.

`https://sat61fusor.example.com/fusor_ui/files/QCI_Requirements.txt`

## Development Workflow

1. Ensure that your [Foreman settings.yaml](https://github.com/theforeman/foreman/) has `login: false` and `require_ssl: false`. Otherwise, API calls will not authenticate properly.
Expand Down
2 changes: 1 addition & 1 deletion fusor-ember-cli/app/templates/components/rhci-start.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</div>

<div class='download-reqs'>
<a download href="/assets/r/QCI_Requirements.txt" target="_blank">
<a download href="/fusor_ui/files/QCI_Requirements.txt" target="_blank">
<span class="pficon pficon-save"></span>
Download these requirements
</a>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row">
<div class="col-xs-offset-1 col-xs-11">
<p>Sample syntax for specifying nodes via CSV can be seen here:
<a href="/assets/r/sample-nodes.csv" target="_blank">sample-nodes.csv</a></p>
<a download href="/fusor_ui/files/sample-nodes.csv" target="_blank">sample-nodes.csv</a></p>
<form class="form-horizontal new-node-form-csv">
<input id="csvUploadInput" class="csv-upload-input" value=selectedCSVFile type="file" accept=".csv" {{action "csvFileChosen" on="change"}}>
</form>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit c90a611

Please sign in to comment.