Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue/#706 #707

Closed
wants to merge 52 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
914481f
Removes sidebar update class
darylhedley Apr 10, 2015
d3a4768
issue/#632
finbartracey1 Apr 14, 2015
535d090
issue/#632
finbartracey1 Apr 14, 2015
e17a4c5
issue/#635
finbartracey1 Apr 14, 2015
edf6e3e
With error with updates being called when they should create new docu…
darylhedley Apr 16, 2015
b0e7eed
Few more additions to the assetView
darylhedley Apr 16, 2015
4abbdfe
Removed fix for node v0.12
darylhedley Apr 16, 2015
d61bdc4
Merge pull request #631 from adaptlearning/issue/#630
brian-learningpool Apr 16, 2015
9f34ffe
Enhancements to backbone forms asset selection
darylhedley Apr 16, 2015
eb8d709
issue/#637
finbartracey1 Apr 17, 2015
977465a
issue/#632
finbartracey1 Apr 17, 2015
d4fc7e0
issue/#637
finbartracey1 Apr 17, 2015
11dda7d
Merge pull request #646 from adaptlearning/issue/#637
brian-learningpool Apr 17, 2015
ef19c21
Adds ifUserIsMe and fixes inverse not being passed back
darylhedley Apr 15, 2015
c7a245a
Merge pull request #647 from adaptlearning/issue/#635
brian-learningpool Apr 21, 2015
3a7af4f
issue/#649-part2
finbartracey1 Apr 21, 2015
c1b5fab
issue/#649-part2
finbartracey1 Apr 21, 2015
e6f1035
Merge branch 'develop' of https://github.com/adaptlearning/adapt_auth…
brian-learningpool Apr 21, 2015
4a1bf85
Filenames in published/previewed courses hashed
brian-learningpool Apr 21, 2015
86ded29
Merge pull request #654 from adaptlearning/use-hashed-filenames-in-ou…
brian-learningpool Apr 21, 2015
4e65597
Merge pull request #655 from adaptlearning/issue/#649-part2
finbartracey1 Apr 22, 2015
c4fbb27
issue/#532
finbartracey1 Apr 23, 2015
21eb516
First initial commit of asset changes
darylhedley Apr 23, 2015
83ee5a9
Corrected caching of the single page app
brian-learningpool Apr 27, 2015
26df464
Merge pull request #657 from adaptlearning/fix-for-caching
brian-learningpool Apr 27, 2015
33529b7
Merge pull request #645 from adaptlearning/switch-editor-to-cdn-dev
brian-learningpool Apr 27, 2015
db6bf3b
Added a check for NodeJS version
brian-learningpool Apr 27, 2015
19a41d4
Adds ability to autofill the graphic component images
darylhedley Apr 29, 2015
19f4f49
Asset management external links
darylhedley Apr 29, 2015
6c45af4
Bug fix with modalView autofill button being clicked without selectin…
darylhedley Apr 29, 2015
a105cc9
Fixes for intermittent IE issues
brian-learningpool Apr 30, 2015
f75d8d7
Few more updates to hero image previews
darylhedley Apr 30, 2015
5bec26f
Merge pull request #667 from adaptlearning/fix-for-IE-loading-issues
brian-learningpool Apr 30, 2015
420df9d
Re-worded NodeJS warning message
brian-learningpool May 5, 2015
8494049
Merge pull request #662 from adaptlearning/issue/660
brian-learningpool May 5, 2015
783e234
Updated to enable alternative models for saving with assets
darylhedley May 6, 2015
0323ed4
Changed user preferences to be session based
darylhedley May 7, 2015
fd8cb7a
Merge pull request #669 from adaptlearning/issue/#663
brian-learningpool May 7, 2015
0424094
Fixes dashboard tags for grid view
darylhedley May 7, 2015
972a93a
Fixes issue with plugins not running their JS in time
darylhedley May 12, 2015
9aaddee
Merge pull request #673 from adaptlearning/issue/#672
darylhedley May 12, 2015
42f3574
Merge pull request #665 from adaptlearning/issue/#644
brian-learningpool May 12, 2015
4b6a343
Merge pull request #670 from adaptlearning/issue/#650
brian-learningpool May 12, 2015
0f7fa34
Fixes issue with inheritance placing the course collection on save of…
darylhedley May 12, 2015
df25a8f
Merge pull request #675 from adaptlearning/issue/#674
brian-learningpool May 12, 2015
533ce38
Some other fixes to tags not allowing images to save
darylhedley May 12, 2015
42f87df
Fixes to hero image not saving properly
darylhedley May 12, 2015
e07f2bf
Merge pull request #676 from adaptlearning/issue/#674
brian-learningpool May 12, 2015
3c394b8
Merge pull request #648 from adaptlearning/issue/#632
brian-learningpool May 13, 2015
23dc886
Fixes issue with Firefox component list widths
brian-learningpool May 14, 2015
b64a121
Merge pull request #677 from adaptlearning/fix-for-component-list-width
brian-learningpool May 14, 2015
8782a40
Fixes reference to files[0] to the actual folder name
darylhedley May 28, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes to hero image not saving properly
darylhedley committed May 12, 2015
commit 42f87df0e9446fe65fd5de3b7d4dc2a5a949f92c
6 changes: 6 additions & 0 deletions frontend/src/core/project/less/project.less
Original file line number Diff line number Diff line change
@@ -167,6 +167,12 @@
}
}

.project-detail-hide-hero {
.field-hero-image {
display:none;
}
}

.project-settings-inner {
padding: 7px 6px;

1 change: 1 addition & 0 deletions frontend/src/core/project/views/projectDetailView.js
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ define(function(require) {

if (this.model.isNew()) {
this.isNew = true;
this.$el.addClass('project-detail-hide-hero');
// Initialise the 'tags' property for a new course
this.model.set('tags', []);
}
4 changes: 2 additions & 2 deletions frontend/src/core/scaffold/views/scaffoldAssetView.js
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ define(function(require) {

checkValueHasChanged: function() {
if ('heroImage' === this.key){
this.saveModel(true);
this.saveModel(false);
return;
}
var contentTypeId = Origin.scaffold.getCurrentModel().get('_id');
@@ -148,7 +148,7 @@ define(function(require) {

if ('heroImage' === this.key){
this.setValue(data.assetId);
this.saveModel(true);
this.saveModel(false);
return;
}
// Setup courseasset