tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUGFIX: 7219-feedback-changes-file-upload 

Altered files from ENHANCEMENT: UI Changes to FileUpload Area
(TRAC-7219 that were missed in the prior push
This commit is contained in:
Naomi Guyer 2012-05-10 12:58:05 +12:00 committed by Ingo Schommer
parent 8e1aae35de
commit 68f9cde226
7 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/css/screen.css
View File

@ -325,7 +325,7 @@ body.cms { overflow: hidden; }
.message.notice a { color: #999; }
.message.warning { background-color: #ffbe66; border-color: #ff9300; }
.message.error, .message.bad, .message.required { background-color: #ffbe66; border-color: #ff9300; }
.message.good { background-color: rgba(101, 168, 57, 0.7); border-color: #65a839; color: #fff; text-shadow: 1px -1px 0 #1f9433; -moz-border-radius: 3px 3px 3px 3px; -webkit-border-radius: 3px 3px 3px 3px; -o-border-radius: 3px 3px 3px 3px; -ms-border-radius: 3px 3px 3px 3px; -khtml-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; }
.message.good { background-color: #65a839; background-color: rgba(101, 168, 57, 0.7); border-color: #65a839; color: #fff; text-shadow: 1px -1px 0 #1f9433; -moz-border-radius: 3px 3px 3px 3px; -webkit-border-radius: 3px 3px 3px 3px; -o-border-radius: 3px 3px 3px 3px; -ms-border-radius: 3px 3px 3px 3px; -khtml-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; }
.message p { margin: 0; }
/** -------------------------------------------- "Add page" dialog -------------------------------------------- */

1
admin/scss/_style.scss
View File

@ -418,6 +418,7 @@ body.cms {
}
&.good {
background-color: $color-good;//for browsers that don't understand rgba
background-color: rgba($color-good,0.7);
border-color: $color-good;
color:#fff;

BIN
images/upload.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

9
javascript/UploadField_downloadtemplate.js
View File

@ -6,10 +6,11 @@ window.tmpl.cache['ss-uploadfield-downloadtemplate'] = tmpl(
'</span></div>' +
'<div class="ss-uploadfield-item-info">' +
'<label class="ss-uploadfield-item-name">' +
'<b>{%=file.name%}</b> ' +
'<span>{%=o.formatFileSize(file.size)%}</span>' +
'{% if (file.error) { %}' +
'<span class="ss-uploadfield-item-status ui-state-error-text">{%=o.options.errorMessages[file.error] || file.error%}</span>' +
'<span class="name">{%=file.name%}</span> ' +
'{% if (!file.error) { %}' +
'<div class="ss-uploadfield-item-status ui-state-success-text">Uploaded</div>' +
'{% } else { %}' +
'<div class="ss-uploadfield-item-status ui-state-error-text">{%=o.options.errorMessages[file.error].substring(0,25) || file.error.substring(0,25)%}</div>' +
'{% } %}' +
'<div class="clear"><!-- --></div>' +
'</label>' +

14
javascript/UploadField_uploadtemplate.js
View File

@ -4,12 +4,11 @@ window.tmpl.cache['ss-uploadfield-uploadtemplate'] = tmpl(
'<div class="ss-uploadfield-item-preview preview"><span></span></div>' +
'<div class="ss-uploadfield-item-info">' +
'<label class="ss-uploadfield-item-name">' +
'<b>{% if (file.name) { %}{%=file.name%}{% } else { %}' + ss.i18n._t('UploadField.NOFILENAME', 'Untitled') + '{% } %}</b> ' +
'<span>{%=o.formatFileSize(file.size)%}</span>' +
'{% if (file.error) { %}' +
'<span class="ss-uploadfield-item-status ui-state-error-text">{%=o.options.errorMessages[file.error] || file.error%}</span>' +
'{% } else { %}' +
'<span class="ss-uploadfield-item-status">0%</span>' +
'<span class="name">{% if (file.name) { %}{%=file.name%}{% } else { %}' + ss.i18n._t('UploadField.NOFILENAME', 'Untitled') + '{% } %}</span> ' +
'{% if (!file.error) { %}' +
'<div class="ss-uploadfield-item-status">0%</div>' +
'{% } else { %}' +
'<div class="ss-uploadfield-item-status ui-state-error-text">{%=o.options.errorMessages[file.error].substring(0,25) || file.error.substring(0,25)%}</div>' +
'{% } %}' +
'<div class="clear"><!-- --></div>' +
'</label>' +
@ -25,4 +24,5 @@ window.tmpl.cache['ss-uploadfield-uploadtemplate'] = tmpl(
'</div>' +
'</li>' +
'{% } %}'
);
);

6
templates/AssetUploadField.ss
View File

@ -36,13 +36,11 @@
</h3>
<div class="fileOverview">
<div class="uploadStatus">
<div class="state started"><% _t('AssetUploadField.UPLOADINPROGRESS', 'Please wait… upload in progress') %></div>
<div class="state completed" style="display:none;"><% _t('AssetUploadField.FILEUPLOADCOMPLETED', 'File Upload Completed!') %></div>
<div class="state"><% _t('AssetUploadField.UPLOADINPROGRESS', 'Please wait… upload in progress') %></div>
<div class="details"><% _t('AssetUploadField.TOTAL', 'Total') %>: <span class="total"></span> <% _t('AssetUploadField.FILES', 'Files') %> <span class="fileSize"></span> </div>
</div>
<div class="ss-uploadfield-item-actions">
<button class="ss-uploadfield-item-edit-all ss-ui-button ui-corner-all" title="<% _t('AssetUploadField.EDITINFO', 'Edit files') %>">
<button class="ss-uploadfield-item-edit-all ss-ui-button ui-corner-all" title="<% _t('AssetUploadField.EDITINFO', 'Edit files') %>" style="display:none;">
<% _t('AssetUploadField.EDITALL', 'Edit all') %>
<span class="toggle-details">
<span class="toggle-details-icon"></span>

14
templates/Includes/UploadField_FileButtons.ss
View File

@ -1,9 +1,17 @@
<% if canEdit %>
<button class="ss-uploadfield-item-edit ss-ui-button ui-corner-all" title="<% _t('UploadField.EDITINFO', 'Edit this file') %>" data-icon="pencil"><% _t('UploadField.EDIT', 'Edit') %></button>
<button class="ss-uploadfield-item-edit ss-ui-button ui-corner-all" title="<% _t('UploadField.EDITINFO', 'Edit this file') %>" data-icon="pencil">
<% _t('UploadField.EDIT', 'Edit') %>
<span class="toggle-details">
<span class="toggle-details-icon"></span>
</span>
</button>
<% if UploadFieldHasRelation %>
<button data-href="$UploadFieldRemoveLink" class="ss-uploadfield-item-remove ss-ui-button ui-corner-all" title="<% _t('UploadField.REMOVEINFO', 'Remove this file from here, but do not delete it from the file store') %>" data-icon="plug-disconnect-prohibition"><% _t('UploadField.REMOVE', 'Remove') %></button>
<button data-href="$UploadFieldRemoveLink" class="ss-uploadfield-item-remove ss-ui-button ui-corner-all" title="<% _t('UploadField.REMOVEINFO', 'Remove this file from here, but do not delete it from the file store') %>" data-icon="plug-disconnect-prohibition">
<% _t('UploadField.REMOVE', 'Remove') %></button>
<% end_if %>
<% end_if %>
<% if canDelete %>
<button data-href="$UploadFieldDeleteLink" class="ss-uploadfield-item-delete ss-ui-button ui-corner-all" title="<% _t('UploadField.DELETEINFO', 'Permanently delete this file from the file store') %>" data-icon="minus-circle"><% _t('UploadField.DELETE', 'Delete from files') %></button>
<% end_if %>
<% end_if %>