-
Notifications
You must be signed in to change notification settings - Fork 289
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2413 from adaptlearning/release/crossframeworkimport
0.10.0 Cross framework import release
- Loading branch information
Showing
36 changed files
with
871 additions
and
313 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,6 +44,10 @@ | |
|
|
||
| .nameEdit { | ||
| display: none; | ||
|
|
||
| .preset-error { | ||
| color: red; | ||
| } | ||
| } | ||
|
|
||
| .label, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 51 additions & 35 deletions
86
frontend/src/modules/frameworkImport/templates/frameworkImport.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,58 @@ | ||
| <div class="inner"> | ||
| <form class="frameworkImport forms" action="importsource" method="post" autocomplete="off"> | ||
| <div class="form-group"> | ||
| <div class="field field-file"> | ||
| <label for="file"> | ||
| {{t 'app.assetfile'}} <span class="req">*</span> | ||
| <span class="error"></span> | ||
| </label> | ||
| <div class="field-help"> | ||
| {{t 'app.importframeworkinstruction'}} | ||
| </div> | ||
| {{#if path}} | ||
| <div class="asset-management-new-asset-file"> | ||
| {{t 'app.importframeworkfileuploaded'}} | ||
| </div> | ||
| {{else}} | ||
| <input type="file" class="asset-file" name="file"> | ||
| {{maxUploadSize}} | ||
| <div class="progress-container"> | ||
| <div class="progress-bar"> | ||
| <div class="progress-percent">0%</div> | ||
| </div> | ||
| <div id="import_upload" class="inner"> | ||
| <form class="frameworkImport forms" action="importsourcecheck" method="post" autocomplete="off"> | ||
| <div class="form-group"> | ||
| <div class="field field-file"> | ||
| <label for="file"> | ||
| {{t 'app.assetfile'}} <span class="req">*</span> | ||
| <span class="error"></span> | ||
| </label> | ||
| <div class="field-help"> | ||
| {{t 'app.importframeworkinstruction'}} | ||
| </div> | ||
| {{#if path}} | ||
| <div class="asset-management-new-asset-file"> | ||
| {{t 'app.importframeworkfileuploaded'}} | ||
| </div> | ||
| {{else}} | ||
| <input type="file" class="asset-file" name="file"> | ||
| {{maxUploadSize}} | ||
| <div class="progress-container"> | ||
| <div class="progress-bar"> | ||
| <div class="progress-percent">0%</div> | ||
| </div> | ||
| {{/if}} | ||
| </div> | ||
| <div class="field field-assets"> | ||
| <label for="tags">{{t 'app.importassetfolderstitle'}}</label> | ||
| <div class="field-help"> | ||
| {{t 'app.importassetfoldersinstruction'}} | ||
| </div> | ||
| <div> | ||
| <input type="text" autocomplete="off" class="width-30" id="formAssetFolders" name="formAssetFolders" placeholder="{{t 'app.importassetfoldersplaceholder'}}" value="" /> | ||
| </div> | ||
| {{/if}} | ||
| </div> | ||
| <div class="field field-assets"> | ||
| <label for="tags">{{t 'app.importassetfolderstitle'}}</label> | ||
| <div class="field-help"> | ||
| {{t 'app.importassetfoldersinstruction'}} | ||
| </div> | ||
| <div class="field field-tags"> | ||
| <label for="tags">{{t 'app.tags'}}</label> | ||
| <input type="text" autocomplete="off" class="width-30" id="tags_control" name="tags_control" value="{{pickCSV tags "title"}}" /> | ||
| <div> | ||
| <input type="text" autocomplete="off" class="width-30" id="formAssetFolders" name="formAssetFolders" placeholder="{{t 'app.importassetfoldersplaceholder'}}" value="" /> | ||
| </div> | ||
| <input type="hidden" name="tags" id="tags" /> | ||
| </div> | ||
| <div class="field field-tags"> | ||
| <label for="tags">{{t 'app.tags'}}</label> | ||
| <input type="text" autocomplete="off" class="width-30" id="tags_control" name="tags_control" value="{{pickCSV tags "title"}}" /> | ||
| </div> | ||
| <input type="hidden" name="tags" id="tags" /> | ||
| </div> | ||
| </form> | ||
| </div> | ||
|
|
||
| <div id="import_details" class="display-none"> | ||
| <form class="frameworkImportDetails forms" action="importsource" method="post" autocomplete="off"> | ||
| <div class="inner framework-versions display-none"></div> | ||
| <div class="inner import-summary"> | ||
| <div class="title"></div> | ||
| <div class="description"></div> | ||
| </div> | ||
| <div class="inner plugin-list display-none"> | ||
| <div class="red key-field display-none"><span class="key">{{t 'app.pluginredlabel'}}</span> - {{t 'app.pluginredkey'}}</div> | ||
| <div class="amber key-field display-none"><span class="key">{{t 'app.pluginamberlabel'}}</span> - {{t 'app.pluginamberkey'}}</div> | ||
| <div class="green-update key-field display-none"><span class="key">{{t 'app.plugingreenupdatelabel'}}</span> - {{t 'app.plugingreenupdatekey'}}</div> | ||
| <div class="green-install key-field display-none"><span class="key">{{t 'app.plugingreeninstalllabel'}}</span> - {{t 'app.plugingreeninstallkey'}}</div> | ||
| </div> | ||
| </form> | ||
| </div> |
20 changes: 20 additions & 0 deletions
20
frontend/src/modules/frameworkImport/templates/frameworkImportPluginHeadingView.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <div class="frameworkImportPlugin-headings tb-heading col-row tb-row"> | ||
|
|
||
| <div class="frameworkImportPlugin-heading col-40"> | ||
| <h4 class="tb-col-inner">{{t 'app.name'}}</h4> | ||
| </div> | ||
|
|
||
| <div class="frameworkImportPlugin-heading col-20 col-centered"> | ||
| <h4 class="tb-col-inner">{{t 'app.importversion'}}</h4> | ||
| </div> | ||
|
|
||
| <div class="frameworkImportPlugin-heading col-20 col-centered"> | ||
| <h4 class="tb-col-inner">{{t 'app.atversion'}}</h4> | ||
| </div> | ||
|
|
||
| <div class="frameworkImportPlugin-heading col-20 col-centered"> | ||
| <h4 class="tb-col-inner">{{t 'app.action'}}</h4> | ||
| </div> | ||
|
|
||
| </div> | ||
| <ul class="frameworkImportPlugin-plugins clearfix grid-layout"></ul> |
16 changes: 16 additions & 0 deletions
16
frontend/src/modules/frameworkImport/templates/frameworkImportPluginView.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <div class="frameworkImport-inner"> | ||
| <div class="frameworkImport-description col-row tb-row {{category}}"> | ||
| <div class="col-40"> | ||
| {{displayName}} | ||
| </div> | ||
| <div class="col-20 col-centered import-version"> | ||
| {{importVersion}} | ||
| </div> | ||
| <div class="col-20 col-centered at-version"> | ||
| {{authoringToolVersion}} | ||
| </div> | ||
| <div class="col-20 col-centered status"> | ||
| {{status}} | ||
| </div> | ||
| </div> | ||
| </div> |
2 changes: 1 addition & 1 deletion
2
frontend/src/modules/frameworkImport/templates/frameworkImportSidebar.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.