stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 03:19:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,512 Commits 4 Branches 0 Tags
f50dbd992d6973caeaaa3139ddf5f908dd84ec79
Commit Graph

223 Commits

Author SHA1 Message Date
Bharat Mediratta
f50dbd992d Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 
Conflicts:
	modules/gallery/controllers/rest.php
 2009-11-25 13:40:47 -08:00
Bharat Mediratta
2e420522ec Preliminary work to cut over to Kohana 2.4 
- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization
 2009-11-25 13:22:24 -08:00
Tim Almdal
454a96f48f Refactor the tags to remove the REST_Controller. Partial fix for ticket #917 2009-11-25 09:08:33 -08:00
Bharat Mediratta
5e9bbbe490 Convert the Simple Uploader form over to Forge, and use the event 
model to let the Tags module modify it.  This brings it inline with
our other module-extensible form based interactions.
 2009-11-20 19:41:45 -08:00
Tim Almdal
eb34b301a7 Add the ability to add tags for files that are uploaded using the simple loader. 2009-11-19 18:08:32 -08:00
Tim Almdal
57adefc5ba Revert "Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme." 
This reverts commit 26114972c3.
 2009-11-19 11:44:01 -08:00
Tim Almdal
26114972c3 Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme. 2009-11-18 15:36:13 -08:00
Bharat Mediratta
1067e68292 Redesign the way that we consider page types to create buckets of page 
types, and a subtype for specifics.  Currently the top level bucket

   collection, item, other

Here are the core subtypes so far:

   collection: album, search, tag
   item: movie, photo
   other: login, reset, comment-fragment, comment

It's legal to create new page_subtypes whenever you want.  Use the
appropriate page_type to get the coarse grain behavior that you want.
 2009-11-17 14:04:45 -08:00
Bharat Mediratta
846f365db9 Normalize tags a bit. 
- Create Tag_Model::url() to mimic Item_Model::url()
- Use the same pagination logic as we do for viewing items
 2009-11-14 16:17:19 -08:00
Tim Almdal
26f8240e34 Revert "Try an new approach to extending forms. Create an extend_form event. For the first attempt replace the comment_add_form and item_add_form events." 
This reverts commit 809e738536.
 2009-11-09 11:52:43 -08:00
Tim Almdal
87f00a5ec5 Merge branch 'master' into talmdal_dev 2009-11-07 07:35:15 -08:00
Tim Almdal
beb63a8380 Clean up the In place edit api: 
1) Only allow 1 in place edit to be active at a time (gets around the issue of using an id to identify the form
2) remove the add_ prefix from some of the api methods
3) clean up inconsistent naming
 2009-11-06 23:05:20 -08:00
Tim Almdal
c40735c922 Merge branch 'master' into talmdal_dev 2009-11-06 22:14:32 -08:00
Tim Almdal
a2d5d8091f The ajaxify_tag_form was not being called when the block was created. Moved the code to ajaxify the add form into the block html and deleted tag.js. Fixes Ticket #872 2009-11-06 07:34:56 -08:00
Tim Almdal
44ae88e8e1 Merge branch 'master' into talmdal_dev 2009-11-06 07:02:55 -08:00
Tim Almdal
72a8ce696e Refactor out the in place editting and use the new gallery.in_place_edit widget to manage the tag renames. Part the fix for ticket #750. 2009-11-05 13:01:01 -08:00
Tim Almdal
809e738536 Try an new approach to extending forms. Create an extend_form event. For the first attempt replace the comment_add_form and item_add_form events. 2009-11-01 13:14:11 -08:00
Tim Almdal
7ea13b3869 Normalize capitalization ticket #596 2009-10-28 12:15:52 -07:00
Chad Kieffer
6ce8733efc Correct tag admin list markup that I likely hacked up during recent commits. These HTML lists now validate. 2009-10-27 07:35:34 -07:00
Chad Kieffer
367e6a8983 Standardize message markup, make the update block status message translatable. 2009-10-23 05:41:41 -07:00
Chad Kieffer
093b209807 Removed console.log() debug output. 2009-10-20 23:22:16 -06:00
Chad Kieffer
5d66416b26 Minor tag admin style updates. 2009-10-20 21:34:47 -06:00
Chad Kieffer
1dd4e4a427 Update tag error messages to use g-action-status and g-message-block. Style g-error for short forms. 2009-10-20 20:56:14 -06:00
Chad Kieffer
ba2d4b923b Rollback tag admin to fix. Now functioning. 2009-10-20 20:20:48 -06:00
Chad Kieffer
c2b32cc2b8 Resolve merge conflict. 2009-10-18 22:45:13 -06:00
Chad Kieffer
47d4cd5cb4 Resolve tag module conflicts. 2009-10-18 20:32:33 -06:00
Chad Kieffer
5f56cbf997 Wrap all admin views in g-block and g-block content. This provides the means to visually separate the view's title and description from everything else. Primary admin view title should always be h1, and only one h1 per view. Removed some unused admin CSS id's. 2009-10-18 20:22:10 -06:00
Chad Kieffer
8cd8fa2b99 Fixed add tag short form layout. 2009-10-18 10:53:18 -06:00
Chad Kieffer
c9ccc24618 Moved the short_form init function to gallery.common and made it jQuery plugin. Dropped gallery.form.js. Applied short forms to server_add and tag admin pages. Added tag.css to admin views. Added .g-wide {}. 2009-10-18 10:32:08 -06:00
Chad Kieffer
08a22f4a39 Add tag.css to tag admin page. 2009-10-17 21:59:53 -06:00
Chad Kieffer
6e4fe79217 White space fixes. 2009-10-17 16:40:55 -06:00
Chad Kieffer
b677eeb5ee Missed this in last commit. 2009-10-17 12:57:34 -06:00
Chad Kieffer
f2b6ec6637 Move tag css from theme to the module. Introduced generic .g-inline class for inline elements, including lists and forms. 2009-10-17 12:48:54 -06:00
Chad Kieffer
c876ec1f50 Apply g-short-form directly to short forms rather than via JS. Comment updates in ui.init.js. 2009-10-16 00:00:52 -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
Tim Almdal
3ceb2775f8 adjust whitespace 2009-10-01 10:59:45 -07: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
Tim Almdal
a210878725 Merge branch 'master' into talmdal_dev 2009-09-30 07:37:14 -07:00
Tim Almdal
60d35b8992 Use the block_manager to manage site sidebar panels. Fixes ticket #110. 
* Extend block_manager to handle sidebar blocks. get_available has become get_available_admin_blocks, get_list becomes get_admin_list.
* Create new functions get_available_site_blocks which will look for gallery_block get_available_site_blocks.
* Refactor sidebar_blocks into a separate function and then call block_manager::get_html(site.sidebar). Convert image_block to use block management instead of theme::sidebar_blocks
* Change the block_manager api so that the theme is passed into the get method. convert info to the new sidebar block approach
* Convert the user module to use the new sidebar block structure. remove the installers for info and image_block modules.
* Convert tag and rss modules to the new sidebar framework. reset the version number to 1 for info and image_block modules.
* Change the get_html method to ignore empty blocks and change the individual handlers to return an empty string if no block is generated
* Add a warning message if no sidebar blocks are active and provide a link to the admin page that configures the sidebar.
 2009-09-30 07:31:12 -07:00
Chad Kieffer
72672bda39 Replaced gButtonLink with g-button. 2009-09-30 08:04:49 -06:00
Chad Kieffer
daa3a2b43c First round of CSS refactor updates. Added calls to gallery.common.css from wind and admin_wind. Replaced basic text align and block float classes. Removed section #2 from both themes screen styles. 2009-09-30 00:32:52 -06:00
Andy Staudacher
d050f0a246 Minor style fix: (string) $var, not (string)$var, and move the explicit cast down where it's needed. 2009-09-17 14:04:13 -07:00
Tim Almdal
2eeacd2656 use an implicit cast to convert the translated error message to a string as it is encoded by the json routines and will be treated as an object otherwise 2009-09-17 13:55:11 -07:00
Tim Almdal
48326ad017 Cleanup issues with the original fix for #779 2009-09-17 12:11:00 -07:00
Tim Almdal
5490057480 When editing tags in place, and there is a validation error, highlight the tag with a red border and show a statust message. This fixes ticket: #779 2009-09-16 12:27:13 -07:00
Andy Staudacher
f1887422f8 Stricter input handling (cast to int) 2009-09-15 23:07:41 -07:00
Andy Staudacher
7608870537 Controller auth / CSRF fixes 2009-09-15 22:51:49 -07:00
Andy Staudacher
e168e0dfae CSRF / auth fixes, golden data file checkpoint 2009-09-15 21:50:48 -07:00
Bharat Mediratta
df85f43aa1 Remove unused $feed->link. 2009-09-08 17:05:38 -07:00
Andy Staudacher
ff1979e12e Fix XSS in tags JS 2009-09-01 01:12:02 -07:00