tonyair/silverstripe-dms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-dms synced 2024-06-28 15:39:45 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitorious.silverstripe.com:2222/electricityauth/dms

Browse Source
This commit is contained in:
Julian Seidenberg 2012-08-13 14:15:04 +12:00
commit 8264ab4396
8 changed files with 82 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
css/DMSDocumentCMSFields.css
View File

@ -28,7 +28,13 @@ form.small .field input.text, form.small .field textarea, form.small .field sele
#ActionsPanel .fieldgroup-field { float: none; width: auto; }
#ActionsPanel .fieldgroup-field .fieldholder-small label { float: none; width: auto; margin: 0; padding: 0; }
#ActionsPanel .fieldgroup-field .fieldholder-small label.ss-ui-button { float: left; margin: 0 10px 0 0; }
#ActionsPanel .ss-uploadfield-files .ss-uploadfield-item-preview { background: url("../images/app_icons/generic_32.png") -10px -6px no-repeat; }
#ActionsPanel .ss-uploadfield-files .ss-uploadfield-item-name span.name { width: 260px; }
#ActionsPanel .ss-uploadfield-files .ss-uploadfield-item-actions .ss-uploadfield-item-cancel { width: auto; text-indent: 0; }
#ActionsPanel .ss-uploadfield-files .ss-uploadfield-item-actions .ss-uploadfield-item-cancel .btn-icon-deleteLight { background-position: 0 -128px; display: inline-block; }
#ActionsPanel .ss-uploadfield-files .ss-uploadfield-item-actions .ss-uploadfield-item-cancel .ui-button-text { display: block; position: relative; float: right; color: #555; padding: 0; padding-left: 2em; }
#Form_ItemEditForm fieldset table.ss-gridfield-table { width: auto; max-width: 508px; }
#Form_ItemEditForm fieldset table.ss-gridfield-table { width: 508px; }
#Form_ItemEditForm fieldset table.ss-gridfield-table tr th.main { min-width: 175px; }
#Form_ItemEditForm fieldset table.ss-gridfield-table tr th.main.col-action_SetOrderID { width: 60px; min-width: 60px; }
#Form_ItemEditForm fieldset table.ss-gridfield-table tr td { white-space: normal; }

2
css/DMSMainCMS.css
View File

@ -1,3 +1,5 @@
.ui-autocomplete { border: 1px solid #DDD; box-shadow: 0 1px 2px 0px #AFAFAF; }
#Root_Documents { padding-left: 0; }
#Root_Documents table { white-space: normal; }
#Root_Documents table th.col-action_SetOrderTitle, #Root_Documents table th.col-FilenameWithoutID { width: 300px; }

64
javascript/DMSDocumentAddExistingField.js
View File

@ -3,42 +3,42 @@
$.entwine('ss', function($) {
$('.document-add-existing .document-autocomplete').entwine({
onmatch: function() {
var self = this;
this.autocomplete({
source: 'admin/pages/adddocument/documentautocomplete',
select: function(event, ui) {
if(ui.item) {
var page_id = $(this).closest('form').find(':input[name=ID]').val();
var document_id = ui.item.value;
$('.document-add-existing .document-autocomplete').entwine({
onmatch: function() {
var self = this;
this.autocomplete({
source: 'admin/pages/adddocument/documentautocomplete',
select: function(event, ui) {
if(ui.item) {
var page_id = $(this).closest('form').find(':input[name=ID]').val();
var document_id = ui.item.value;
jQuery.ajax(
'admin/pages/adddocument/linkdocument?ID=' + page_id + '&documentID=' + document_id,
{
dataType: 'json',
success: function(data, textstatus) {
var fn = window.tmpl.cache['ss-uploadfield-addtemplate'];
var fnout = fn({
files: [data],
formatFileSize: function (bytes) {
if (typeof bytes !== 'number') return '';
if (bytes >= 1000000000) return (bytes / 1000000000).toFixed(2) + ' GB';
if (bytes >= 1000000) return (bytes / 1000000).toFixed(2) + ' MB';
return (bytes / 1000).toFixed(2) + ' KB';
},
options: self.fileupload('option')
});
jQuery.ajax(
'admin/pages/adddocument/linkdocument?ID=' + page_id + '&documentID=' + document_id,
{
dataType: 'json',
success: function(data, textstatus) {
var fn = window.tmpl.cache['ss-uploadfield-addtemplate'];
var fnout = fn({
files: [data],
formatFileSize: function (bytes) {
if (typeof bytes !== 'number') return '';
if (bytes >= 1000000000) return (bytes / 1000000000).toFixed(2) + ' GB';
if (bytes >= 1000000) return (bytes / 1000000).toFixed(2) + ' MB';
return (bytes / 1000).toFixed(2) + ' KB';
},
options: self.fileupload('option')
});
$('.ss-add-files').append(fnout);
$('.ss-add-files').append(fnout);
}
}
}
);
);
}
}
}
});
}
});
});
}
});
});
}(jQuery));

1
javascript/DMSDocumentCMSFields.js
View File

@ -60,7 +60,6 @@
}
});
});
}(jQuery));

35
scss/DMSDocumentCMSFields.scss
View File

@ -123,13 +123,41 @@ form.small .field .TreeDropdownField,
}
}
}
.ss-uploadfield-files{
.ss-uploadfield-item-preview{
background: url('../images/app_icons/generic_32.png') -10px -6px no-repeat;
}
.ss-uploadfield-item-name{
span.name{
width: 260px;
}
}
.ss-uploadfield-item-actions{
.ss-uploadfield-item-cancel{
width: auto;
text-indent:0;
.btn-icon-deleteLight{
background-position: 0 -128px;
display: inline-block;
}
.ui-button-text{
display: block;
position: relative;
float: right;
color: #555;
padding:0;
padding-left: 2em;
}
}
}
}
}
#Form_ItemEditForm{
fieldset{
table.ss-gridfield-table{
width: auto;
max-width:508px;
width: 508px;
//max-width:508px;
tr{
th.main{
min-width:175px;
@ -138,6 +166,9 @@ form.small .field .TreeDropdownField,
min-width:60px;
}
}
td{
white-space:normal;
}
}
}
}

5
scss/DMSMainCMS.scss
View File

@ -1,5 +1,10 @@
//data-icon="cross-circle"
.ui-autocomplete{
border: 1px solid #DDD;
box-shadow: 0 1px 2px 0px #AFAFAF;
}
#Root_Documents{
padding-left: 0;
table{

6
templates/DMSDocumentAddExistingField.ss
View File

@ -1,4 +1,4 @@
<div class="ss-add">
<div class="ss-add ss-upload">
<div class="document-add-existing field">
<h3>
@ -8,7 +8,7 @@
</span>
</h3>
<input class="document-autocomplete" placeholder="Search by ID or filename" />
<input class="document-autocomplete text" type="text" placeholder="Search by ID or filename" />
</div>
<div class="ss-assetuploadfield">
@ -18,7 +18,7 @@
<span class="title">Edit Document Details</span>
</span>
</h3>
<div class="fileOverview">
<!-- <div class="fileOverview"></div> -->
<ul class="files ss-uploadfield-files ss-add-files"></ul>
</div>
</div>

0
testfile
View File