Skip to content
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.

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

A new upload input and fixes #22

Merged
merged 44 commits into from
Mar 22, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
2571e28
Fixed a bug where a SfilStoredFile could be erased mistakenly.
daniel-abrahao Mar 1, 2013
a49b670
Original schema
daniel-abrahao Mar 2, 2013
1f02a17
Starting the AjaxUpload component for burocrata
daniel-abrahao Mar 3, 2013
a3d30b2
Receiving the pieces on JjMedia plugin
daniel-abrahao Mar 3, 2013
eadc161
AjaxUpload progress: a lot of error checking and fail-proof code.
daniel-abrahao Mar 4, 2013
44699c3
Some steps forwarding to the AjaxUpload completion
daniel-abrahao Mar 4, 2013
65a0fbd
Deletion of UserProfile is disabled when the profile has users
daniel-abrahao Mar 4, 2013
68d7e42
Reloading cache of compiled permission if needed
daniel-abrahao Mar 4, 2013
4ebfacb
UserUser list changes
daniel-abrahao Mar 4, 2013
2ea4862
Changed the password field of user form to a password input
daniel-abrahao Mar 4, 2013
34bd8c6
Better validation and flux control for user form
daniel-abrahao Mar 4, 2013
225872c
Creating a caption manager for Javascript
daniel-abrahao Mar 6, 2013
7a8920c
Caption system ready
daniel-abrahao Mar 7, 2013
6dd5682
Merge branch 'js_captions' into mega-upload
daniel-abrahao Mar 7, 2013
74a3618
Some fixes making the AjaxUpload funcional
daniel-abrahao Mar 8, 2013
2801a83
New helper class: BuroCaptionerHelper
daniel-abrahao Mar 8, 2013
e19c693
Added interpolate functionality to the BuroCaption.get()
daniel-abrahao Mar 8, 2013
5b176e7
Better and more solid separation of the classic upload and the new HT…
daniel-abrahao Mar 14, 2013
30f2822
Indentation changes and new captions
daniel-abrahao Mar 14, 2013
a842f0d
Creating a garbage collector for abandoned uploads
daniel-abrahao Mar 14, 2013
4e1208f
Documenting and introduced a new parameter: -quiet
daniel-abrahao Mar 14, 2013
df7da34
Aborting ajax upload already working
daniel-abrahao Mar 14, 2013
57bd292
Some fixes: smaller timeout for upload and clearing correctly the fol…
daniel-abrahao Mar 14, 2013
ab6ca26
More changes to the ajax upload input
daniel-abrahao Mar 15, 2013
784d8d9
BuroOfficeBoy enhancement
daniel-abrahao Mar 19, 2013
5a59cb4
Some fixes to the HTML5 upload input
daniel-abrahao Mar 21, 2013
72f928a
Some translations strings
daniel-abrahao Mar 21, 2013
cc09924
Fixing the addCallbacks of BuroUploadGeneric
daniel-abrahao Mar 21, 2013
e520f5c
Created the new BuroAjaxUpload callback: onSave
daniel-abrahao Mar 21, 2013
6d6c87a
Allowing to specify the saving model of Upload inputs
daniel-abrahao Mar 21, 2013
286e400
Some re-factor on BuroAjaxUpload code
daniel-abrahao Mar 21, 2013
1219e99
Moving forward to the great finish!
daniel-abrahao Mar 21, 2013
8a7c7ef
Removing a bunch of "empty" files from jj_media plugin
daniel-abrahao Mar 21, 2013
2233b13
Removing console.log() calls from code.
daniel-abrahao Mar 21, 2013
cb5dfdf
Translation of some portuguese code
daniel-abrahao Mar 21, 2013
40cafc3
Showing image preview: need test, though.
daniel-abrahao Mar 21, 2013
68eae1c
More changes to the BuroAjaxUpload
daniel-abrahao Mar 22, 2013
80d196c
Upload input fully functional, finally!
daniel-abrahao Mar 22, 2013
fec41cb
Making the old version to work
daniel-abrahao Mar 22, 2013
3a4377f
Last fixes
daniel-abrahao Mar 22, 2013
17ab9e3
CSS fix for progress bar inside forms inside forms.
daniel-abrahao Mar 22, 2013
cc949aa
A example of use of content_stream input on layout_test.
daniel-abrahao Mar 22, 2013
4c0089c
Some improvements on CsContentStreamHolder behavior
daniel-abrahao Mar 22, 2013
0db8790
Merge branch 'mega-upload'
daniel-abrahao Mar 22, 2013
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
13 changes: 13 additions & 0 deletions src/cake/app/models/cs_test.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

class CsTest extends AppModel
{
var $actsAs = array(
'Containable',
'ContentStream.CsContentStreamHolder' => array(
'streams' => array(
'cs_content_stream_id' => 'document'
)
)
);
}
4 changes: 2 additions & 2 deletions src/cake/app/plugins/backstage/config/backstage.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
),
'customRow' => true,
'customSearch' => true,
'contain' => array('UserPermission'),
'contain' => array('UserPermission', 'UserUser'),
),
'user_permissions' => array(
'actions' => array('delete','edit', 'create'),
Expand All @@ -70,4 +70,4 @@
'customSearch' => true,
),
)
);
);
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,12 @@ function create_empty_translation($moduleName, $id = null)

function layout_test()
{

$this->loadModel('CsTest');
$data = $this->CsTest->findById(1);
if (empty($data))
{
$data = $this->CsTest->save(array('id' => 1));
}
$this->data = $data;
}
}
25 changes: 22 additions & 3 deletions src/cake/app/plugins/backstage/views/back_contents/layout_test.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ echo $this->Bl->sbox(null, array('size' => array('M' => 7, 'g' => -1)));
'default' => 'Suspendisse dignissim ante sit amet leo bibendum rhoncus? Integer at enim eget tortor cursus tristique. Cras vel vehicula nisi? Phasellus nisl massa, commodo sed porttitor quis, imperdiet quis lacus. Aliquam erat volutpat. Sed dictum, dui blandit sodales dapibus, sapien massa mollis augue, in porta ligula odio vel sapien. Donec interdum metus eu nunc tristique mattis. Donec luctus aliquam lectus, quis fermentum arcu dignissim at.'
)
)
);
);

// Textarea with textile controll
echo $this->Buro->input(
Expand Down Expand Up @@ -224,7 +224,25 @@ echo $this->Bl->sbox(null, array('size' => array('M' => 7, 'g' => -1)));
)
)
);


echo $this->Buro->sform(null, array('model' => 'CsTest'));

echo $this->Buro->input(
array(),
array(
'type' => 'content_stream',
'label' => 'Label for a content_stream input',
'instructions' => 'Instructions for a content_stream input',
'options' => array(
'foreignKey' => 'cs_content_stream_id'
)
)
);
echo $this->Bl->floatBreak();

echo $this->Buro->eform();
echo $this->Bl->floatBreak();

// Datetime without time
echo $this->Buro->input(
null,
Expand Down Expand Up @@ -289,7 +307,8 @@ echo $this->Bl->sbox(null, array('size' => array('M' => 7, 'g' => -1)));
'type' => 'upload',
'fieldName' => 'upload',
'label' => 'Label for a upload input',
'instructions' => 'Instructions for a upload input'
'instructions' => 'Instructions for a upload input',
'options' => array('model' => 'JjMedia.SfilBigFile')
)
);

Expand Down
Binary file not shown.
Loading