stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-16 15:09:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,143 Commits 4 Branches 0 Tags
c8a8097ef2ebbb78d7d20b99f1ea2af3da946bca
Commit Graph

184 Commits

Author SHA1 Message Date
Bharat Mediratta
cfbbf9ef60 Convert __toString() to use (string) cast instead. 2010-01-27 21:58:06 -08:00
Tim Almdal
0a482127b2 Merge branch 'master' into talmdal_dev 
Conflicts:
	modules/organize/js/organize.js
 2009-12-27 08:35:19 -08:00
Bharat Mediratta
55f9408d50 Fix the scrollbar in the organize panel by restricting drag-to-select to #g-organize-microthumb-grid. 2009-12-26 15:08:14 -08:00
Tim Almdal
3060a6f662 Merge branch 'master' into talmdal_dev 
Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php
 2009-12-26 11:24:50 -08:00
Bharat Mediratta
da7ee6ab30 Fix over-targetting in CSS 2009-12-25 13:24:47 -08:00
Bharat Mediratta
07a9ef2276 Convert some database calls 2009-12-25 13:24:38 -08:00
Bharat Mediratta
8b9a02084a Updates for the latest version of Kohana 2.4: 
1) Controller::$input is gone -- use Input::instance() now
2) Handle new 'database.<default>.connection.params' parameter
3) Handle new 'cache.<default>.prefix' parameter
 2009-12-21 21:27:43 -08:00
Bharat Mediratta
a3d904bcba ORM::find_all() now uses null as the default value for offset. 2009-11-26 19:36:57 -08:00
Bharat Mediratta
e8fb773b68 Update all portable where clauses to the new Kohana 2.4 format. 2009-11-26 19:33:03 -08:00
Tim Almdal
a1fbc8b1e1 Correct the reference so selections are handled properly when dragging the lasso 2009-11-20 12:15:05 -08:00
Tim Almdal
aa880c2b10 Use ui-state-highlight to display selected images. 2009-11-20 11:37:09 -08:00
Tim Almdal
72deeb1119 Remove all style from the organize.css file and make use of the themeroller styles as much as possible. 2009-11-20 10:26:11 -08:00
Chad Kieffer
33d2a2481e MInor message-block padding fixes in general and specifically for organize. 2009-11-15 23:27:37 -07:00
Chad Kieffer
fb2c365d8f Fix outstanding issues in the organize dialog. Tighten up the layout a bit so that more microthumbs will display. 2009-11-15 22:55:09 -07:00
Chad Kieffer
de3bfac2ec Fixed indenting. 2009-11-15 18:02:20 -07:00
Chad Kieffer
66e1e32f34 Removed YUI grids. Added g- prefix to selected class. Layout almost completely restored, still need to fix action-status message box 2009-10-28 23:34:53 -06:00
Chad Kieffer
e72d3532f7 Amazing what a two character change can do. It should be g-first now, not first. 2009-10-28 22:57:36 -06:00
Chad Kieffer
b118d56e9a Added type attribute to script tag. 2009-10-28 22:52:17 -06:00
Chad Kieffer
02b6366dd2 Switch instances of first to g-first. 2009-10-27 07:37:04 -07:00
Chad Kieffer
02ecf5749c Make menu label adhere to our capitalization standard. 2009-10-25 18:34:36 -06:00
Chad Kieffer
859f8dc558 Consolidated the rest of the base message styles into lib/gallery.common.css and applied updates to views. Moved over draggable/droppable styles. Use g-target consistently for drag/drop interactions. Minor re-ordering of selectors in gallery.common.css. Updates to css comments. 2009-10-07 00:21:23 -06:00
Chad Kieffer
d581bbbd1e Renamed more CSS selectors from gName to g-name. 2009-10-04 15:53:00 -06:00
Chad Kieffer
3e6ba7acc3 Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features. 2009-10-04 00:27:22 -06:00
Chad Kieffer
e1e8904e4a Convert gDialog and gCancel over to g-dialog and g-cancel. Refactor CSS id's and classes in the login/reset password dialog. 2009-09-30 22:49:36 -06:00
Chad Kieffer
72672bda39 Replaced gButtonLink with g-button. 2009-09-30 08:04:49 -06:00
Andy Staudacher
7608870537 Controller auth / CSRF fixes 2009-09-15 22:51:49 -07:00
Tim Almdal
5f343ab8a0 Change the variable to to resolve ticket #769 2009-09-14 08:11:12 -07:00
Tim Almdal
6c0732e16f Set the AlbumTreeContainer instead of the height. This fixes ticket #755 2009-09-13 16:24:03 -07:00
Tim Almdal
1d40c77c4c Update the organize module to use the release version of jquery Selectable. Unfortunately this does not have the functionality to select additional thumbnails using the ctrl or alt-keys, it is preferable to forking the Selectable component. This functionality should arrive with ui.jquery 1.8.x 2009-09-12 08:53:24 -07:00
Tim Almdal
25ea6085b7 Reset the margins when the mouse is over a thumbnail when dragging. When the border is displayed then adjust the margin to account for the border. Just hidding the border causes things to move. 2009-09-10 21:26:07 -07:00
Bharat Mediratta
752c857116 Rename ORM_MPTT::is_descendant() to ORM_MPTT::contains() to make the 
API a little clearer.  Write a test for it, too.
 2009-09-10 10:28:43 -07:00
Bharat Mediratta
b550a06045 Rename $album to $target in move_to() 2009-09-10 10:08:29 -07:00
Tim Almdal
2bbe162339 A better fix for #741... the original problem was that the source and album variables were reversed 2009-09-10 10:09:09 -07:00
Tim Almdal
bea89be268 If the current drop target is not defined, in that we have moved out of the range of the current li elements, then assume the drop is occurring at the end of the list items. Fixes #742 2009-09-10 07:59:29 -07:00
Tim Almdal
eb345cb870 Changed the check in organize_Controller::move_to: 
1) check that target and source are not the same.
2) check that the source is not already a child of the target (use to be a
   descendant) Fixes #741.
 2009-09-10 06:17:21 -07:00
Bharat Mediratta
9fbdcf3efd Change the module installer so that you don't need to provide your own 
install() function if all you're going to do is to set the version of
the module from module.info into the database.  This means that for some
simple modules, you don't need an install.php file at all.
 2009-09-05 13:39:30 -07:00
Bharat Mediratta
ab7323d17b Fix the url in the call to get subsequent entries to have the right 
url, and to be json.  Fixes #719, which I introduced in my refactor.
 2009-09-04 21:27:23 -07:00
Bharat Mediratta
dfb2e3dd02 Add an icon to the context menu option. 2009-08-31 23:27:46 -07:00
Bharat Mediratta
0513713fde Add 'organize album' to the context menu. 2009-08-31 21:05:21 -07:00
Bharat Mediratta
c10b5cc69c Minor refactoring. 2009-08-30 17:00:33 -07:00
Bharat Mediratta
7015948357 Merge branch 'master' of git@github.com:/gallery/gallery3 2009-08-30 16:20:52 -07:00
Andy Staudacher
e7f5e0a9a3 Merge commit 'upstream/master' 
Conflicts:

	modules/gallery/views/l10n_client.html.php
	modules/organize/views/organize_tree.html.php
	modules/server_add/helpers/server_add_event.php
 2009-08-30 18:27:40 -07:00
Bharat Mediratta
74e204b557 Don't mark colors !important. 2009-08-30 16:17:53 -07:00
Bharat Mediratta
0dba5857fa Make comments consistent. 2009-08-30 16:16:39 -07:00
Bharat Mediratta
4593297533 Remove extra padding line 2009-08-30 16:15:54 -07:00
Bharat Mediratta
d47a4de029 Get rid of as much jitter as possible in the organize tree. 2009-08-30 16:11:28 -07:00
Bharat Mediratta
2cf52a4718 Tighten up a class attr. 2009-08-30 15:54:56 -07:00
Bharat Mediratta
6fdb5cddf8 Make the lasso more prominent and the colors consistent. 2009-08-30 15:45:35 -07:00
Bharat Mediratta
a015078cca Change the higlight/selection behavior so that we don't use opacity to 
indicate selection state.  It's too difficult to tell opacity
differences on light colored photos.  This approach models what
WinXP does.
 2009-08-30 15:42:43 -07:00
Bharat Mediratta
64d40397fe Simplify over-targetted CSS. 2009-08-30 15:34:47 -07:00