Skip to content

ASYNCUP-23 : Modify Macros for hiding button when javascript is enabled #4

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ASYNCUP-23 : Modify Macros for hiding button when javascript is enabled #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 22 additions & 14 deletions webapp/WEB-INF/templates/skin/plugins/asynchronousupload/upload_commons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,31 @@


<#macro addFileInput fieldName handler cssClass multiple=false>
<span class="file-input btn btn-primary btn-file">
<span class="form-inline file-input">
<input type="file" name="${fieldName}" id="${fieldName}" <#if multiple>multiple="multiple"</#if> class="${cssClass!} ${handler.handlerName}" />
<!-- <button class="btn btn-primary btn-sm" name="${handler.uploadSubmitPrefix}${fieldName}" id="${handler.uploadSubmitPrefix}${fieldName}" value="${handler.uploadSubmitPrefix}${fieldName}" type="submit" >
#i18n{asynchronousupload.action.send.name}
</button>-->
<noscript>
<button class="btn btn-primary btn-sm" name="${handler.uploadSubmitPrefix}${fieldName}" id="${handler.uploadSubmitPrefix}${fieldName}" value="${handler.uploadSubmitPrefix}${fieldName}" type="submit" >
<i class="fa fa-upload"></i>
<span class="file-input-text-noscript">#i18n{asynchronousupload.action.send.name}</span>
<span class="file-input-text-js" style="display:none;">#i18n{asynchronousupload.action.browse.name}</span>
</button>
</noscript>
</span>
<input type="hidden" name="asynchronousupload.handler" value="${handler.handlerName}" />
<div id="progress_${fieldName}" class="progress" style="display:none;">
<div id="progress-bar_${fieldName}" class="progress-bar progress-bar-success progress-bar-striped">&nbsp;</div>
</div>
</#macro>
<#macro addFileInputImage fieldName handler cssClass multiple=false>
<span class="file-input btn btn-primary btn-file">
<input type="file" name="${fieldName}" id="${fieldName}" <#if multiple>multiple="multiple"</#if> class="${cssClass!} ${handler.handlerName}${fieldName}" />
<!-- <button class="btn btn-primary btn-sm" name="${handler.uploadSubmitPrefix}${fieldName}" id="${handler.uploadSubmitPrefix}${fieldName}" value="${handler.uploadSubmitPrefix}${fieldName}" type="submit" >
#i18n{asynchronousupload.action.send.name}
</button>-->
<span class="form-inline file-input">
<input type="file" style="display:inline-block;" name="${fieldName}" id="${fieldName}" <#if multiple>multiple="multiple"</#if> class="${cssClass!} ${handler.handlerName}" />
<noscript>
<button class="btn btn-primary btn-sm" name="${handler.uploadSubmitPrefix}${fieldName}" id="${handler.uploadSubmitPrefix}${fieldName}" value="${handler.uploadSubmitPrefix}${fieldName}" type="submit" >
<i class="fa fa-upload"></i>
<span class="file-input-text-noscript">#i18n{asynchronousupload.action.send.name}</span>
<span class="file-input-text-js" style="display:none;">#i18n{asynchronousupload.action.browse.name}</span>
</button>
</noscript>
</span>
<input type="hidden" name="asynchronousupload.handler" value="${handler.handlerName}" />
<div id="progress_${fieldName}" class="progress" style="display: none;">
Expand All @@ -60,9 +68,9 @@
<div id="_file_error_box_${fieldName}" >
</div>

<div class="form-group well" <#if !has_files>style="display:none;"</#if> id="_file_deletion_label_${fieldName}">
<label class="control-label">#i18n{asynchronousupload.file.uploadedFile}</label>
<div id="_file_deletion_${fieldName}">
<div class="form-group" <#if !has_files>style="display:none;"</#if> id="_file_deletion_label_${fieldName}">
<label class="col-xs-12 col-sm-12">#i18n{asynchronousupload.file.uploadedFile}</label>
<div id="_file_deletion_${fieldName}" class="col-md-12">

<#assign file_index = 0>
<#if has_files>
Expand All @@ -78,7 +86,7 @@
</#if>
<#if filename != '' >
<div class="checkbox" id="_file_uploaded_${fieldName}${file_index}">
<label class="col-xs-12 col-sm-12 col-md-12 col-lg-12" for="${handler.uploadCheckboxPrefix}${fieldName}${file_index}">
<label class="col-xs-12 col-sm-12" for="${handler.uploadCheckboxPrefix}${fieldName}${file_index}">
<input type="checkbox" name="${handler.uploadCheckboxPrefix}${fieldName}${file_index}" value="1" />${filename}</label>
<#assign file_index = file_index + 1>
</div>
Expand All @@ -87,7 +95,7 @@
</#if>
</div>
<br />
<div class="">
<div class="col-xs-12 col-sm-12">
<button class="btn btn-danger btn-sm" name="${handler.uploadDeletePrefix}${fieldName}" value="${handler.uploadDeletePrefix}${fieldName}" type="submit" >#i18n{asynchronousupload.action.delete.name}</button>
</div>
</div>
Expand Down