Skip to content

Commit

Permalink
Merge pull request sakaiproject#2415 from ramonchu2k/SAK-30997
Browse files Browse the repository at this point in the history 
SAK-30997: Checkbox alignment issues in download all/upload all screen
  • Loading branch information
@juanjmerono
juanjmerono committed May 3, 2016
2 parents ffd7982 + a217af3 commit 4028bd4
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 31 deletions.
49 changes: 18 additions & 31 deletions ...nt/assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_uploadAll.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,69 +43,56 @@
<h4><span class="reqStar">*</span>$tlang.getString("uploadall.choose.file2")</h4>
</div>
#end
<p class="checkbox indnt2">
<p class="checkbox">
## select-all box
<input type="checkbox" name="selectall" id="selectall" title="$tlang.getString('gen.toggle')" onclick="ASN.toggleSelectAll(this, 'choices')" />
<label for="selectall">$tlang.getString("all")</label><br/>
<label for="selectall"><input type="checkbox" name="selectall" id="selectall" title="$tlang.getString('gen.toggle')" onclick="ASN.toggleSelectAll(this, 'choices')" /> $tlang.getString("all")</label><br/>
#if ($!includeSubmissionText)
## student submission text
<input id="studentSubmissionText" type="checkbox" value="studentSubmissionText" name="choices" class="toggleSelectedAll" #if($!hasSubmissionText)checked="checked"#end onclick="ASN.deselectSelectAll( this );" />
<label for="studentSubmissionText">$tlang.getString("uploadall.choose.file.studentSubmissionText")</label><br/>
<label for="studentSubmissionText"><input id="studentSubmissionText" type="checkbox" value="studentSubmissionText" name="choices" class="toggleSelectedAll" #if($!hasSubmissionText)checked="checked"#end onclick="ASN.deselectSelectAll( this );" /> $tlang.getString("uploadall.choose.file.studentSubmissionText")</label><br/>
#end
#if ($!includeSubmissionAttachment)
## student submission attachment
<input id="studentSubmissionAttachment" type="checkbox" value="studentSubmissionAttachment" name="choices" class="toggleSelectedAll" #if($!hasSubmissionAttachment)checked="checked"#end onclick="ASN.deselectSelectAll( this );" />
<label for="studentSubmissionAttachment">$tlang.getString("uploadall.choose.file.studentSubmissionAttachment")</label><br/>
<label for="studentSubmissionAttachment"><input id="studentSubmissionAttachment" type="checkbox" value="studentSubmissionAttachment" name="choices" class="toggleSelectedAll" #if($!hasSubmissionAttachment)checked="checked"#end onclick="ASN.deselectSelectAll( this );" /> $tlang.getString("uploadall.choose.file.studentSubmissionAttachment")</label><br/>
#end
## grade files
<input id="gradeFile" type="checkbox" value="gradeFile" name="choices" class="toggleSelectedAll" #if($!hasGradeFile)checked="checked"#end onclick="ASN.deselectSelectAll( this );" />
<label for="gradeFile">$tlang.getString("uploadall.choose.file.gradeFile")</label><br/>
<label for="gradeFile"><input id="gradeFile" type="checkbox" value="gradeFile" name="choices" class="toggleSelectedAll" #if($!hasGradeFile)checked="checked"#end onclick="ASN.deselectSelectAll( this );" /> $tlang.getString("uploadall.choose.file.gradeFile")</label><br/>
</p>
<p class="checkbox indnt3">
<input id="gradeFileFormat_csv" type="radio" value="csv" name="gradeFileFormat" #if($gradeFileFormat=="csv")checked="checked"#end onclick="ASN.deselectSelectAll( this );" />
<label for="gradeFileFormat_csv">$tlang.getString("uploadall.choose.file.gradeFile.csv")</label><br/>
<input id="gradeFileFormat_excel" type="radio" value="excel" name="gradeFileFormat" #if($gradeFileFormat=="excel")checked="checked"#end onclick="ASN.deselectSelectAll( this );" />
<label for="gradeFileFormat_excel">$tlang.getString("uploadall.choose.file.gradeFile.excel")</label><br/>
<p class="radio">
<label for="gradeFileFormat_csv" class="innerRadio"><input id="gradeFileFormat_csv" type="radio" value="csv" name="gradeFileFormat" #if($gradeFileFormat=="csv")checked="checked"#end onclick="ASN.deselectSelectAll( this );" /> $tlang.getString("uploadall.choose.file.gradeFile.csv")</label><br/>
<label for="gradeFileFormat_excel" class="innerRadio"><input id="gradeFileFormat_excel" type="radio" value="excel" name="gradeFileFormat" #if($gradeFileFormat=="excel")checked="checked"#end onclick="ASN.deselectSelectAll( this );" /> $tlang.getString("uploadall.choose.file.gradeFile.excel")</label><br/>
</p>
<p class="checkbox indnt2">
<p class="checkbox">
#if ($!includeSubmissionText)
## feedback text
<input id="feedbackTexts" type="checkbox" value="feedbackTexts" name="choices" class="toggleSelectedAll" #if($!hasFeedbackText)checked="checked"#end onclick="ASN.deselectSelectAll( this );" />
<label for="feedbackTexts">$tlang.getString("uploadall.choose.file.feedbackTexts")</label><br/>
<label for="feedbackTexts"><input id="feedbackTexts" type="checkbox" value="feedbackTexts" name="choices" class="toggleSelectedAll" #if($!hasFeedbackText)checked="checked"#end onclick="ASN.deselectSelectAll( this );" /> $tlang.getString("uploadall.choose.file.feedbackTexts")</label><br/>
#end
## feedback comments
<input id="feedbackComments" type="checkbox" value="feedbackComments" name="choices" class="toggleSelectedAll" #if($!hasComments)checked="checked"#end onclick="ASN.deselectSelectAll( this );" />
<label for="feedbackComments">$tlang.getString("uploadall.choose.file.feedbackComments")</label><br/>
<label for="feedbackComments"><input id="feedbackComments" type="checkbox" value="feedbackComments" name="choices" class="toggleSelectedAll" #if($!hasComments)checked="checked"#end onclick="ASN.deselectSelectAll( this );" /> $tlang.getString("uploadall.choose.file.feedbackComments")</label><br/>
## feedback attachments
<input id="feedbackAttachments" type="checkbox" value="feedbackAttachments" name="choices" class="toggleSelectedAll" #if($!hasFeedbackAttachment)checked="checked"#end onclick="ASN.deselectSelectAll( this );" />
<label for="feedbackAttachments">$tlang.getString("download.feedback.attachment")</label><br/>
<label for="feedbackAttachments"><input id="feedbackAttachments" type="checkbox" value="feedbackAttachments" name="choices" class="toggleSelectedAll" #if($!hasFeedbackAttachment)checked="checked"#end onclick="ASN.deselectSelectAll( this );" /> $tlang.getString("download.feedback.attachment")</label><br/>
<br/>
## SAK-19147 output without folders
#if ($!download && $enableFlatDownload)
<input id="withoutFolders" type="checkbox" value="withoutFolders" name="choices" class="toggleNotSelectedAll" #if($!withoutFolders)checked="checked"#end onclick="ASN.deselectSelectAll( this );" />
<label for="withoutFolders">$tlang.getString("uploadall.folders.no")</label><br/>
<label for="withoutFolders"><input id="withoutFolders" type="checkbox" value="withoutFolders" name="choices" class="toggleNotSelectedAll" #if($!withoutFolders)checked="checked"#end onclick="ASN.deselectSelectAll( this );" /> $tlang.getString("uploadall.folders.no")</label><br/>
#end
## include empty submissions, old behavior
##Only show this on the download, upload takes it all
#if ($download)
<hr/>
<input id="includeNotSubmitted" type="checkbox" value="includeNotSubmitted" name="choices" #if($!hasIncludeNotSubmitted)checked="checked"#end />
<label for="includeNotSubmitted" style="font-weight:bold;">$tlang.getString("uploadall.choose.file.includeNotSubmitted")</label><br/>
<label for="includeNotSubmitted" style="font-weight:bold;"><input id="includeNotSubmitted" type="checkbox" value="includeNotSubmitted" name="choices" #if($!hasIncludeNotSubmitted)checked="checked"#end /> $tlang.getString("uploadall.choose.file.includeNotSubmitted")</label><br/>
#end

</p>

#if (!$download)
<h4>$tlang.getString("uploadall.releaseOption")</h4>
<div class="checkbox indnt2">
<p class="radio">
## release uploaded info
<input type="radio" name="release" id="release_true" value="true" #if($!releaseGrades)checked="checked"#end>
<label for="release_true">$tlang.getString("uploadall.releaseOption.yes")</label>
<label for="release_true"><input type="radio" name="release" id="release_true" value="true" #if($!releaseGrades)checked="checked"#end /> $tlang.getString("uploadall.releaseOption.yes")</label>
<br/>
## NOT release uploaded info
<input type="radio" name="release" id="release_false" value="false" #if(!$!releaseGrades)checked="checked"#end>
<label for="release_false">$tlang.getString("uploadall.releaseOption.no")</label>
</div>
<label for="release_false"><input type="radio" name="release" id="release_false" value="false" #if(!$!releaseGrades)checked="checked"#end /> $tlang.getString("uploadall.releaseOption.no")</label>
</p>
#end
<p class="act">
#if ($download)
Expand Down
5 changes: 5 additions & 0 deletions reference/library/src/morpheus-master/sass/modules/tool/assignments/_assignments.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,9 @@
#reorder-list-sortingToolBar, #reorder-list{
max-width: 1200px;
}

label.innerRadio{
margin-left: 20px;
}

}

0 comments on commit 4028bd4

Please sign in to comment.