TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up some sloppy work

This commit is contained in:
Sam Georges 2014-09-12 20:20:52 +10:00
parent 8ee2135c31
commit c2a71e88bb
7 changed files with 75 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/backend/formwidgets/fileupload/assets/css/fileupload.css
View File

@ -282,6 +282,7 @@ html:not(.touch) .field-fileupload .attachment-item .uploader-toolbar a.uploader
html:not(.touch) .field-fileupload .attachment-item .uploader-toolbar a.uploader-remove:hover {
color: #c73f26;
}
html:not(.touch) .field-fileupload .attachment-item .uploader-toolbar a.uploader-config,
html:not(.touch) .field-fileupload .attachment-item .uploader-toolbar a.uploader-file-link {
display: inline-block;
}

1
modules/backend/formwidgets/fileupload/assets/less/fileupload.less
View File

@ -312,6 +312,7 @@ html:not(.touch) {
}
}
&.uploader-config,
&.uploader-file-link {
display: inline-block;
}

38
modules/backend/formwidgets/fileupload/partials/_file_multi.htm
View File

@ -55,21 +55,29 @@
{{#description}}
<p><abbr title="{{description}}">{{description}}</abbr></p>
{{/description}}
<a
href="javascript:;"
class="uploader-remove oc-icon-times"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-data="file_id: {{id}}"></a>
<a
href="javascript:;"
class="uploader-config oc-icon-cog"
data-control="popup"
data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
data-request-data="file_id: {{id}}"></a>
<a
href="{{path}}"
class="uploader-file-link oc-icon-paper-clip"
target="_blank"></a>
<?php if (!$this->previewMode): ?>
<a
href="javascript:;"
class="uploader-remove oc-icon-times"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-data="file_id: {{id}}"></a>
<?php endif ?>
<div class="controls">
<?php if (!$this->previewMode): ?>
<a
href="javascript:;"
class="uploader-config oc-icon-cog"
data-control="popup"
data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
data-request-data="file_id: {{id}}"></a>
<?php endif ?>
<a
href="{{path}}"
class="uploader-file-link oc-icon-paper-clip"
target="_blank"></a>
</div>
</div>
<div class="uploader-loading"></div>
</div>

37
modules/backend/formwidgets/fileupload/partials/_file_single.htm
View File

@ -47,23 +47,30 @@
{{#description}}
<p><abbr title="{{description}}">{{description}}</abbr></p>
{{/description}}
<a
href="javascript:;"
class="uploader-remove oc-icon-times"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-data="file_id: {{id}}"></a>
<a
href="javascript:;"
class="uploader-config oc-icon-cog"
data-control="popup"
data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
data-request-data="file_id: {{id}}"></a>
<?php if (!$this->previewMode): ?>
<a
href="javascript:;"
class="uploader-remove oc-icon-times"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-data="file_id: {{id}}"></a>
<?php endif ?>
<a
href="{{path}}"
class="uploader-file-link oc-icon-paper-clip"
target="_blank"></a>
<div class="controls">
<?php if (!$this->previewMode): ?>
<a
href="javascript:;"
class="uploader-config oc-icon-cog"
data-control="popup"
data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
data-request-data="file_id: {{id}}"></a>
<?php endif ?>
<a
href="{{path}}"
class="uploader-file-link oc-icon-paper-clip"
target="_blank"></a>
</div>
</div>
</script>

24
modules/backend/formwidgets/fileupload/partials/_image_multi.htm
View File

@ -56,21 +56,23 @@
{{#description}}
<p><abbr title="{{description}}">{{description}}</abbr></p>
{{/description}}
<?php if (!$this->previewMode): ?>
<a
href="javascript:;"
class="uploader-remove oc-icon-times"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-data="file_id: {{id}}"></a>
<?php endif ?>
<div class="controls">
<?php if (!$this->previewMode): ?>
<a
href="javascript:;"
class="uploader-config oc-icon-cog"
data-control="popup"
data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
class="uploader-remove oc-icon-times"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-data="file_id: {{id}}"></a>
<?php endif ?>
<div class="controls">
<?php if (!$this->previewMode): ?>
<a
href="javascript:;"
class="uploader-config oc-icon-cog"
data-control="popup"
data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
data-request-data="file_id: {{id}}"></a>
<?php endif ?>
<a

22
modules/backend/formwidgets/fileupload/partials/_image_single.htm
View File

@ -49,20 +49,24 @@
{{#description}}
<p><abbr title="{{description}}">{{description}}</abbr></p>
{{/description}}
<a
href="javascript:;"
class="uploader-remove oc-icon-times"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-data="file_id: {{id}}"></a>
<div class="controls">
<?php if (!$this->previewMode): ?>
<a
href="javascript:;"
class="uploader-config oc-icon-cog"
data-control="popup"
data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
class="uploader-remove oc-icon-times"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-data="file_id: {{id}}"></a>
<?php endif ?>
<div class="controls">
<?php if (!$this->previewMode): ?>
<a
href="javascript:;"
class="uploader-config oc-icon-cog"
data-control="popup"
data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
data-request-data="file_id: {{id}}"></a>
<?php endif ?>
<a
href="{{path}}"
class="uploader-file-link oc-icon-paperclip"

3
modules/system/assets/js/framework.js
View File

@ -204,7 +204,7 @@ if (window.jQuery === undefined)
if (data['X_OCTOBER_ERROR_FIELDS']) {
var isFirstInvalidField = true
$.each(data['X_OCTOBER_ERROR_FIELDS'], function(fieldName, fieldMessages){
var fieldElement = form.find('[name="'+fieldName+'"], [name$="['+fieldName+']"]').filter(':enabled').first()
var fieldElement = form.find('[name="'+fieldName+'"], [name="'+fieldName+'[]"], [name$="['+fieldName+']"], [name$="['+fieldName+'][]"]').filter(':enabled').first()
if (fieldElement.length > 0) {
var _event = jQuery.Event('ajaxInvalidField')
@ -244,6 +244,7 @@ if (window.jQuery === undefined)
if (loading) loading.show()
$(window).trigger('ajaxBeforeSend')
$el.trigger('ajaxPromise')
return $.ajax(requestOptions)
.fail(function(jqXHR, textStatus, errorThrown){