Commit Graph

5681 Commits

Author SHA1 Message Date
Bharat Mediratta
fcd39be28b Specify a default margin for all buttons in the common css. Fixes
ticket #1165.
2010-06-20 10:43:25 -07:00
Bharat Mediratta
4a7b41c5a4 Merge branch 'master' of git://github.com/mamouneyya/gallery3
Conflicts:
	lib/gallery.common.css
2010-06-20 10:25:03 -07:00
mamouneyya
c7ce0228de (1) Correct the margin direction for checkboxes in RTL (2) Update the id of adding comment button for RTL (3) Flip the corner radiuses for any buttons set, which solves the issue of flipped corners in the comments admin page. Also, add the CSS3 selector of the round corners so they work in Opera (4) Fix ticket #1052 2010-06-21 01:21:03 +08:00
Bharat Mediratta
6ebbb4fbf5 Updated golden files. 2010-06-20 09:51:39 -07:00
Bharat Mediratta
2e01685553 Add "comments" relationship support. 2010-06-20 09:40:35 -07:00
Bharat Mediratta
ec052d7130 Assert how many files we analyze so that we can tell if we're suddenly
analzying too many or too few.
2010-06-20 09:36:56 -07:00
Bharat Mediratta
9f9d3866e8 Exclude the .git directory. 2010-06-20 09:28:36 -07:00
Bharat Mediratta
ab9049d531 Remove trailing ?> 2010-06-20 09:05:25 -07:00
Bharat Mediratta
1a210dd270 Add "json" as a valid view suffix. 2010-06-20 09:03:23 -07:00
Bharat Mediratta
719328a5a7 If we use <?= .. ?> on the last line, it looks like we've got a
trailing ?> and that causes File_Structure_Test to be sad.  So instead
use echo and tack on our own newline.  But this also requires a
semicolon.  Weird, I know but still easier than fixing up the test.
2010-06-20 09:02:59 -07:00
Bharat Mediratta
db53ca550e Merge branch 'master' of github.com:gallery/gallery3 2010-06-20 08:50:51 -07:00
Bharat Mediratta
f6025026eb Rename error_rest.php to error_rest.json.php so that we specify the
result type in the filename as is our convention for views.
2010-06-20 08:50:19 -07:00
Tim Almdal
a57ac38839 Change the organize dialog to make use of the new error handling 2010-06-19 17:32:15 -07:00
Bharat Mediratta
d86d1a32e8 Updated for comment REST relationships. 2010-06-19 15:12:58 -07:00
Bharat Mediratta
f451804c6d $request->params might not exist. 2010-06-19 15:00:44 -07:00
Bharat Mediratta
1ba9d079bf post_test() should be using admin, not guest. 2010-06-19 15:00:33 -07:00
Bharat Mediratta
cd96ed8873 $response is optional in the Rest_Exception constructor. 2010-06-19 14:13:34 -07:00
Bharat Mediratta
456d54ea2d Throw exceptions as appropriate, but allow the Kohana exception
handling framework to handle the exception and delegate to our
template, which will JSON encode the response.
2010-06-19 14:07:37 -07:00
Bharat Mediratta
41ca2b0195 Rework our exception framework to fit into Kohana's model better.
Instead of overwriting Kohana_Exception::handle() (which we were doing
in MY_Kohana_Exception) we instead use their existing template system.

gallery/views/kohana/error.php overrides system/views/kohana/error.php
and is the standard error template for all exceptions.  Our version of
error.php figures out the appropriate view based on context (cli,
authenticated admin, guest viewing a 404, guest viewing a system
error) and delegates appropriately.  Each delegated view has a narrow
responsibility.

This paves the way for us to add new error views per module.  For
example, the rest module will define its own template in
Rest_Exception and then its exceptions can be rendered the way that it
wants (json encoded, in that case).
2010-06-19 14:07:32 -07:00
Bharat Mediratta
5736698b4b single -> double quotes. 2010-06-19 10:51:05 -07:00
Bharat Mediratta
009323e0a0 Merge branch 'master' of github.com:gallery/gallery3 2010-06-19 10:24:38 -07:00
Bharat Mediratta
fa404589d6 Oops. Fix up a bad instance of $user in rest::access_key() introduced
in my last change.
2010-06-19 10:24:26 -07:00
Tim Almdal
239da24786 Merge branch 'master' of git@github.com:gallery/gallery3 2010-06-18 21:49:26 -07:00
Tim Almdal
e40b2371ee Fix an issue that the root album was not being selected if there was no
children, or if organize was being invoked on the root album.
2010-06-18 21:49:11 -07:00
Bharat Mediratta
9b78867427 Simplify rest::get_access_key($user) to rest::access_key() that
returns just the access key string for the active user.  That's how we
use the API, so keep it simple.
2010-06-18 20:43:14 -07:00
Bharat Mediratta
295a42e0f1 change single to double quotes. 2010-06-18 20:20:05 -07:00
Tim Almdal
545a91270d 1) Change how the size of the flexstage is calculated. (Basically remove the
dialogWidth and dialogHeight and adjsut the internal controls when added to
   the stage.
2) Cleanup the controller code
2010-06-18 19:05:59 -07:00
Tim Almdal
ba19c03aeb Update the installer/install.sql properly. 2010-06-18 16:52:05 -07:00
Bharat Mediratta
bc70ff498d Use request::protocol() 2010-06-18 15:25:33 -07:00
Bharat Mediratta
ec40e03a37 Use request::protocol(). 2010-06-18 15:20:32 -07:00
Bharat Mediratta
b1a6fd3e59 Use request::protocol(). 2010-06-18 15:18:56 -07:00
Bharat Mediratta
f0a99ffc27 Undo "else" clause -- we should keep the logic simple and easy to
follow, even if it's redundant.

Expand a <ul> to multiple lines.
2010-06-18 14:31:04 -07:00
mamouneyya
2cd784e612 Merge remote branch 'gallery3/master' 2010-06-18 23:30:49 +03:00
mamouneyya
6078eb6264 Add '! important' to the round corners properties with values, force them to be shown even with the case the element has two or more of them (e.g. class='ui-corner-left ui-corner-right'.) Don't know if there was a better solution.. 2010-06-18 23:29:37 +03:00
Tim Almdal
84c8d1c79a Fix ticket #1155. For compatibility with gallery2 increase the size of the tag name field from 64 bytes to 128 bytes. 2010-06-18 06:51:02 -07:00
mamouneyya
2e1056d3c7 Merge remote branch 'gallery3/master' 2010-06-18 14:11:54 +03:00
mamouneyya
3b89a56caf Flip some margin/padding values for RTL 2010-06-18 14:10:05 +03:00
mamouneyya
562fb174a7 Flip some margin/padding values for RTL 2010-06-18 14:08:08 +03:00
mamouneyya
7f8e2786b3 Mirror the cancel button for RTL 2010-06-18 14:07:38 +03:00
mamouneyya
9173ea8167 Add the CSS3 selector of the round corners so they work in Opera 2010-06-18 14:07:16 +03:00
mamouneyya
d84cdcb8fc (1) Correct the margin direction for checkboxes in RTL (2) Update the id of adding comment button for RTL (3) Flip the corner radiuses for any buttons set, which solves the issue of flipped corners in the comments admin page. Also, add the CSS3 selector of the round corners so they work in Opera (4) Fix ticket #1052 2010-06-18 14:06:41 +03:00
Tim Almdal
fce95785be Remove duplicate trailing slash on the controllerUri parameter 2010-06-17 17:41:35 -07:00
Tim Almdal
70f56ba43a Fix for ticket #1163. Don't all guests to a comment when there are no comments and the comment access permission is register users. 2010-06-17 14:22:35 -07:00
Tim Almdal
e82aa6dcd8 Update the xss gold file with changes to views in the last couple of commits. 2010-06-17 10:22:19 -07:00
Tim Almdal
070db2a97a Rearrange the adding of fields to the template so that they match the order of appearance in the template. Also remove the @todo's 2010-06-17 10:21:37 -07:00
Bharat Mediratta
359235182e Add a cache-buster to the SWF url so that it'll refresh in the browser
every time the SWF file changes.
2010-06-17 09:57:38 -07:00
Tim Almdal
a03e3d1dc1 Fix for ticket #1110. Need to use the encode_path with a movie extension to find the item. Thanks to samdavidoff for the initial fix. 2010-06-17 09:38:36 -07:00
Tim Almdal
2bbce8dddb Fix for ticket #1117 align videos to the center. 2010-06-17 09:10:01 -07:00
Tim Almdal
6e54286ef2 Add the theme::resize_top and theme::resize_bottom to the movie view to be consistent with the photo view. 2010-06-17 09:03:39 -07:00
Tim Almdal
38d09c5d1a Scale a movie to the resize size so that it doesn't overflow into the sidebar. 2010-06-17 08:03:08 -07:00