Skip to content

Commit

Permalink
SAK-32606 make Overwrite use a fieldset like Availability (sakaiproje…
Browse files Browse the repository at this point in the history
  • Loading branch information
ottenhoff authored Jun 16, 2017
1 parent 8f69a98 commit d3ce775
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
8 changes: 7 additions & 1 deletion content/content-bundles/resources/types.properties
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ avail.start = Beginning
avail.start1 = From
avail.title = Availability
avail.zipdownload = Download Zip

versioning.title = Versioning
versioning.hint = Uploaded items should
versioning.overwrite = Overwrite existing files
versioning.newversion = Create new version

button.actions = Actions
button.add = Add
button.startadd = Start Add Menu
Expand Down Expand Up @@ -190,7 +196,7 @@ to upload the file(s) to this website. Text, graphics and other media files may
even if your site is restricted to site members.
instr.dnd.uploads = Files can be uploaded individually or in ZIP archives. Expand ZIPs after uploading via the \
file''s Action menu. Click Continue when ready to complete the upload. Note that you cannot upload more than {0} MB of \
material at once.<br /> \
material at once.<br /><br /> \
Copyright: It is your personal responsibility to verify that you have permission from the copyright holder \
to upload the file(s) to this website. Text, graphics and other media files may all be subject to copyright control \
even if your site is restricted to site members.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,25 @@
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
<div class="dz-default dz-message"><button type="button">$tlang.getString("label.dragZoneMessage")</button></div>
</form>
<div>
<input type="checkbox" name="overwrite" id="overwrite" checked="checked" value="true">$tlang.getString("overwrite.text")
</div>
<br />
<div id="fileUploaderDesc" class="instruction">
<p>$tlang.getString("label.dragDescription")</p>
<p>$instr_dnd_uploads</p>
</div>
<form name="addContentForm" id="addContentForm" method="post" action="#toolForm("ResourcesHelperAction")" enctype="multipart/form-data">
<input type="hidden" name="pipe-init-id" id="pipe-init-id" value="$!{pipe-init-id}" />
<input type="hidden" name="requestStateId" id="requestStateId" value="$!{requestStateId}" />

<fieldset>
<legend><h4>$tlang.getString("versioning.title") <small>$tlang.getString("versioning.hint") </small></h4></legend>
<div class="form-group">
<input type="radio" name="overwrite" id="overwrite" value="true" checked="checked" />
<label for="overwrite">$tlang.getString("versioning.overwrite")</label>
<input type="radio" name="overwrite" id="overwrite" value="false" />
<label for="overwrite">$tlang.getString("versioning.newversion")</label>
</div>
</fieldset>

#if ($model.resourceTypeDef.hasNotificationDialog())
#if($model.isDropbox())
## SAK-18932 show email checkbox only when possible to use it
Expand Down

0 comments on commit d3ce775

Please sign in to comment.