Commit Graph

78 Commits

Author SHA1 Message Date
Tim Almdal
066854424a Add a method to create a micro_thumb that is centered vertically in
its container (initially used for organize album view)
2009-03-27 17:36:14 +00:00
Tim Almdal
9d35437167 Update comments to reflect that the results of item::children or
item::descendants uses the specified sort order
2009-03-26 17:42:17 +00:00
Bharat Mediratta
2067314186 untabify 2009-03-25 01:34:04 +00:00
Tim Almdal
3523bf5d90 Change the item model so it will actually delete all the file system
objects when an item is deleted.
2009-03-24 19:04:43 +00:00
Tim Almdal
fd58fe0ae0 Fix for ticket #168: Set a default value for extra_attrs on the Item_Model::thumb_tag() 2009-03-23 14:51:09 +00:00
Bharat Mediratta
e1c53921d3 Don't divide by zero in thumb_tag if there's no thumbnail 2009-03-20 20:33:20 +00:00
Chad Kieffer
0695be1ccf Restore $extra_attrs in img tags. Roll back to using .gThumbnail in quick pane. 2009-03-20 04:39:27 +00:00
Tim Almdal
ccb02b001f Fix for ticket #155. Delete the item record before unlinking the
files.
2009-03-18 22:42:31 +00:00
Bharat Mediratta
e92e6d4da4 Oops, I used the wrong resize variables in my last change. 2009-03-16 11:33:14 +00:00
Bharat Mediratta
c825ec4ffb Move references to "album" out of ORM_MPTT since it's supposed to be
implementation agnostic.
2009-03-15 01:17:25 +00:00
Bharat Mediratta
f9122c7908 Don't use html::image because it forces absolute urls, which we don't want. 2009-03-14 21:24:32 +00:00
Bharat Mediratta
e658b9895e Default thumb/resizes to relative urls. 2009-03-14 18:31:56 +00:00
Tim Almdal
b9ee37f30e Override the ORM_MTTP::children and ORM_MTPP::descendants methods in
the item model and always pass the orderby fields.  This insures that
all children or descendant calls will respect the album sort order.
2009-03-09 14:38:25 +00:00
Tim Almdal
ac82e0a9df Change Item_Model::get_position to respect the sort order. This also
forced the next/prev buttons in album navication to respect the sort
order as well.
2009-03-09 13:43:13 +00:00
Bharat Mediratta
1ad7ca639d Make the description a text column so that we can handle much larger
descriptions.
2009-03-09 03:29:22 +00:00
Tim Almdal
f371c663c5 Fix for ticket #114 Permissions seem to be ignored 2009-03-05 17:16:38 +00:00
Bharat Mediratta
83e12961b1 Allow url() to return absolute urls 2009-03-04 06:25:25 +00:00
Bharat Mediratta
515c081f79 Add support MP4 movies also. Flowplayer supports them and can stream
them using the h264streaming plugin.  Everything else is a fairly
minor change.
2009-02-25 05:27:29 +00:00
Tim Almdal
585ea81957 Fix for ticket #98.
The problem was that item::delete was deleting the parent album
2009-02-24 19:52:01 +00:00
Bharat Mediratta
ffbab952c6 If the album_cover_item_id points to a missing item (unlikely but possible) just treat it like it was missing and continue 2009-02-22 23:54:48 +00:00
Bharat Mediratta
baff63b70b Very basic movie support. You can upload a FLV file, we use ffmpeg to
extract a thumbnail out of it and if you click through we show it
using flowplayer.
2009-02-22 05:21:44 +00:00
Tim Almdal
1fc2307fab rollback r20001-r19998, r19995. This may require a reinstall 2009-02-08 02:21:28 +00:00
Tim Almdal
a3704c8dd8 Assign the Album|Photo path field explicitly instead of hiding that in
the item::__set magic method.
2009-02-07 17:16:48 +00:00
Tim Almdal
4e107dac41 Implement fix for ticket #35. *** Requires reinstall of core ***
* Added new field in items table (path) which is sanitized version of
name.
* Added __set method on Items_module to set the path field whenever
the name field is changed.
* Made some changes to the scaffolding so missing the path column
would not kill the scaffolding.
* Changed MY_url::site so not having a 3rd parameter won't throw an error.
2009-02-06 16:39:18 +00:00
Tim Almdal
80d4df3a4a Convert all item->type == "album" to item->is_album()
Convert all item->type == "photo" to item->is_photo()
2009-02-06 03:47:36 +00:00
Bharat Mediratta
b4f92c7de6 Add delete support as a quick-edit option 2009-01-29 09:26:39 +00:00
Bharat Mediratta
894a33d744 Add support for pretty urls. So now instead of urls like:
http://example.com/gallery3/index.php/albums/2
  http://example.com/gallery3/index.php/photos/9

You'll see urls like:
  http://example.com/gallery3/index.php/Family/Weddings
  http://example.com/gallery3/index.php/Family/Weddings/Bob.jpg
2009-01-29 03:22:02 +00:00
Bharat Mediratta
eed57674f9 Add move support. Use the move icon in the quick pane. You can't
move an item into its own hierarchy, or into an album where you don't
have edit permission.
2009-01-24 05:14:44 +00:00
Bharat Mediratta
94e356fc31 Take advantage of the new support for parentheses added in r19879 and
fix a bug in viewable() that was AND'ing all view permissions together
(which meant that you had to have *all* permissions to view an item,
instead of just one).

Also, add a "max" param to the thumb_tag() so that we can specify a
max dimension for the thumbnail.  This will be used in the upcoming
"move item" feature.
2009-01-23 08:11:33 +00:00
Bharat Mediratta
2d7ab6f4da Create Item_Model::thumb_tag() and Item_Model::resize_tag() to provide
an abstraction for when we add movie support.
2009-01-14 07:21:35 +00:00
Bharat Mediratta
7017e95c99 Allow passing a query string as an argument to Item_Model::url() 2009-01-04 09:28:57 +00:00
Bharat Mediratta
3d9e5e439e Stay on the right page when we navigate up in the breadcrumb.
Introduce a "show" parameter which contains the id of the item that we
want to show when we go to the parent's page.
2009-01-03 20:14:06 +00:00
Bharat Mediratta
c1140b5c0a Add Item_Model::url() and use it where appropriate. Cleans up some
grotty looking stuff in themes.
2008-12-31 07:13:34 +00:00
Bharat Mediratta
1579494ec4 Preliminary "Edit Permissions" dialog. You can't change permissions
yet, but it shows you which items have locked view perms.
2008-12-31 04:05:41 +00:00
Bharat Mediratta
672eca5337 Lots of deltas rolled up into a bigger change. Sorry for the mess.
1) Deleted in-place-editing.  We'll be replacing this with a real edit
   system that groups settings together and is more coherent.

2) Tweaked the way that dialog boxes work to get the ajax stuff working
   again.  It's imperfect and does not work properly for uploading images.
   This is going to get redone also, but this is a good resting point.

3) Created edit forms for albums and photos.  Moved _update and _create out
   of Items_Controller and into the individual subclasses.

4) Created access::required which is a shorthand for:
    if (!access::can(...)) {
      access::forbidden();
    }

5) Added validation rules to Items_Model

6) Converted login to use the regular modal dialog approach in the theme.
2008-12-24 00:20:26 +00:00
Bharat Mediratta
2502240ce4 Add very simple graphics toolkits.
Track a set of rules in Graphics_Rule_Model which specify how we turn
original images into thumbnails and resizes.  There's one set of rules
that applies to every image in the Gallery.

Track the state of thumbs and resizes with a "dirty" bit.  The new
graphics helper manages the rules and can rebuild the thumbs and
resizes for any images that are considered "dirty".

Introduce the concept of an "album cover" which is an item that an
album points to.  We'll use that item as the source for the album's
thumbnail/resize.

Conflated with this change (sorry!) I also changed the Var table to
use module_name instead of module_id.  This may be marginally less
efficient, but it's much easier to follow in the database.
2008-12-23 04:14:07 +00:00
Bharat Mediratta
99c481897b Add "created" and "updated" timestamps to the items table. 2008-12-20 22:49:32 +00:00
Bharat Mediratta
b37047ff55 Add Item_Model::viewable() which we can use to restrict any query to
just items viewable by the active user.  Ie:

  ORM::factory("item")
    ->where("name", "foo")
    ->find_all()

Would get all items with the name "foo".

  ORM::factory("item")
    ->viewable()
    ->where("name", "foo")
    ->find_all()

Restricts it to just the set of items that the user is allowed to see.
2008-12-17 22:39:33 +00:00
Bharat Mediratta
8630d61051 Change the album thumbnail/resize from _album.jpg to .album.pjg
because the leading underscore confuses the Kohana router.
2008-12-17 04:55:49 +00:00
Bharat Mediratta
fc7b78492b Separate thumbnails out into var/thumbs. This clears up some ambiguity in Item_Model and simplifies
file_proxy.  It also means we can stop munging file names in the var/resizes hierarchy.

In the process, rename "thumbnail" to "thumb" everywhere in honor of
Chad (well, ok because it's shorter)..
2008-12-17 04:45:35 +00:00
Bharat Mediratta
f4c6a20149 Remove error checking; if this fails let it fail noisily for now so that we can find problems faster. 2008-12-16 23:59:33 +00:00
Bharat Mediratta
d9e02a5d0c Various optimizations:
o Add model_cache::get() which caches models avoiding duplicate lookups
o Stop using ORM relationships for Item_Model::owner so that we can use caching
o For Item_Model::xxx_edit fields, don't make them editable for guests
o Other minor stuff.

These optimizations reduce the number of queries for a 9-photos page from ~200
to ~45.  Still way too many!
2008-12-16 04:29:00 +00:00
Tim Almdal
43e626f99e Change the resize option on creating thumbnails and resizes to Image::AUTO which will preserve the aspect ratio of the original image 2008-12-12 21:37:11 +00:00
Bharat Mediratta
2cf3233f54 Get rid of all pseudo users and pseudo groups, while preserving all
other functionality.  This makes our user/group and access code
fully consistent.
2008-12-12 00:59:30 +00:00
Bharat Mediratta
fef188d787 Leave all locking in ORM_MPTT::move_to, don't worry about it in
Item_Model::move_to, unless it turns out that we really need to.
2008-12-07 09:25:40 +00:00
Bharat Mediratta
055aa04497 Rename moveTo to move_to and extend the test a bit. 2008-12-07 08:23:22 +00:00
Tim Almdal
8d1790a0b4 * Add a moveTo unit test
* Pass the module::event(..., $data) by reference to the handlers
2008-12-05 04:56:33 +00:00
Tim Almdal
0f103b1c06 Moving albums around with a drag and drop interface seems to work and preserve the left right pointers.
* changed _lock and _unlock to protected methods lock and lock respectively
* added a moveTo method on the Item_Model
* Corrected the hole closure  on delete.
* added moveTo on the ORM_MTPP class
* Changed the rearrange javascript to do moves with ajax
2008-12-04 20:05:58 +00:00
Tim Almdal
5c095cbd78 Add unit tests to test growing and contracting the left and right pointers
Added a delete method to ORM_MPTT that contracts the tree when an item is deleted
2008-12-04 01:12:44 +00:00
Tim Almdal
9ae6acdc0a Before deleting an item, save the path to the image in the var directory as once the item is deleted, the $item->file_path() is no longer valid. 2008-12-04 00:14:52 +00:00