Commit Graph
1376 Commits
Author SHA1 Message Date
Bharat Mediratta df84861833 If the argument to app() is not an album id, switch to the item parent.
Fixes ticket #489.
2009-06-29 20:23:23 -07:00
Bharat Mediratta b579db5173 Oops, "head" => "admin_head" to make the admin dashboard work. 2009-06-29 20:08:35 -07:00
Andy Staudacher 06172ecdb9 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-29 19:56:52 -07:00
Andy Staudacher 333c9d47e3 Fix HTML in l10n message 2009-06-29 19:53:05 -07:00
Bharat Mediratta 8af19c0625 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-29 19:33:42 -07:00
Andy Staudacher b57be646fe Don't repeat the default locale in the installed locales list. 2009-06-29 19:24:48 -07:00
Bharat Mediratta 95b900d4f4 Fix some bugs in the combined JS/CSS code (most of which I introduced
in my last refactor):

1) Actually combine the JS (I was only combining the CSS)
2) Add line breaks between the files and comment them so that we can
   find a specific file inside the blob.
3) Add an HTML comment to help developers figure out why they can't
   find their CSS/JS.
2009-06-29 19:11:59 -07:00
Bharat Mediratta 325203e1ca Add a media type using the most common media type from our CSS. This
doesn't fix the problem that we need to support multiple media types
(the original code had superfish using just "screen", and some other
deviations).

There's no code yet to support multiple media types, but it would not
be too difficult to create buckets based on media.
2009-06-29 18:27:29 -07:00
Bharat Mediratta fa8ca2f7ad Refactor combine_xxx() functions together into combine_files() and use
html functions to generate the resulting elements.  Add phpdoc.
2009-06-29 18:12:53 -07:00
Bharat Mediratta 3080317d6e Refactor combined controller a bit
1) Create public javascript() and css() functions and turn __call()
   into a private function to protect us against having some random
   type show up in there.  Otherwise anything you put in the 2nd
   argument gets emitted in the header which is a security hole.

2) Fix a bug ("$key = $key[0]") which was breaking functionality.
   Eliminate the hex check, it's not really necessary in the majority
   case and doesn't hurt us in edge cases.

3) Convert some empty() calls to !, no need for a function call there.

4) Add phpDoc.
2009-06-29 17:44:02 -07:00
Tim Almdal 006b63030a Combine the Combined::javascript and Combined::css into a single method implemented
by the magic method __call. The first parameter is the content type for text/xxxx
and the 2nd parameter is the key of the combined file.
2009-06-29 15:38:55 -07:00
Tim Almdal 86596f9595 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-29 15:04:15 -07:00
jhilden 4dab7f8dd0 admin dashboard blocks can now be moved from left to right sidebar
fix for bug report #92
removed containment parameter for the jQuery sortable plugin
seems to work in Firefox, Chrome and IE 8
2009-06-29 16:23:12 -04:00
jhilden b31b3bd5bf Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-29 16:03:45 -04:00
jhilden eb82f6a64a added textual description of upload progress
moved the cancel link to above the upload queue (where the textual upload progress also is)
2009-06-29 16:02:11 -04:00
Tim Almdal 34c76c0906 A Combined javascript seems to work.
1) CSS files are added to the combined version by use of $theme->css() or $theme->css_theme() methods
2) url references in the css are converted to full paths as opposed to relative
3) @import statements in the css are resolved as well.
4) need to move the [if IE] statements into the css files so the will be honored in the browser. currently the ie fix css are always included.
2009-06-29 12:32:11 -07:00
Bharat Mediratta 16d4922e3a Remove unused $theme_relative arg from theme_script(). 2009-06-29 09:07:29 -07:00
Tim Almdal 6ec293dfe7 *Note* work in progress.
Implement the combined css functionality.  Local url references and replace with absolute urls instead of relative.
2009-06-29 08:24:42 -07:00
Tim Almdal 10b4eda6f0 Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
	modules/gallery/libraries/Theme_View.php
	themes/admin_default/views/admin.html.php
2009-06-29 06:44:05 -07:00
Tim Almdal 42c82ef7f0 Temporary checkin to allow merge with trunk... don't integrate 2009-06-29 06:08:50 -07:00
Bharat Mediratta 6e8a8c53e6 Rename $theme->url() to $theme->theme_url() for consistency wiht
$theme->theme_script().
2009-06-28 19:49:48 -07:00
Bharat Mediratta c4f991bb7d Clean up the combined javascript change and refactor out the
Gallery_View base class from Theme_View and Admin_View.

1) Move all the theme specific jquery stuff from gallery_theme::head()
and admin_head() into the theme files.  Use $theme->script() as
appropriate.

2) Get rid of the extra boolean on $theme->url() that we were using so
that we could call $theme->script($theme->url(...)) -- add
$theme->theme_script() instead (poorly named, but still clearer than
what we had before)

3) Fix the bug that combined scripts didn't work at all in the admin
theme.

4) Get rid of $theme->display() in favor of new View(...)
2009-06-28 19:45:11 -07:00
Bharat Mediratta 24f0c4bd19 Undo my last change; it's not the right fix for the problem. 2009-06-28 18:10:42 -07:00
Bharat Mediratta b235fd6e5f Pass the item into the block. 2009-06-28 18:00:00 -07:00
Bharat Mediratta 5b2c08d797 Set the gallery module version to 6 in install() (missed this in my last change).
Refresh the install.sql.
2009-06-28 17:37:14 -07:00
Bharat Mediratta df37b5ce70 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-28 17:09:45 -07:00
Bharat Mediratta 9bdc84733d use jquery.scrollTo to scroll the active upload into view. 2009-06-28 17:07:41 -07:00
Tim Almdal d90e30c378 Rename the combined javascript controller from javascript/combined to combined/javascript. 2009-06-28 17:07:12 -07:00
Chad Kieffer bf79d4372c Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-28 17:57:23 -06:00
Chad Kieffer 2b804ebdce Convert info module's block to use a list instead of a table. Addresses request in ticket #441. 2009-06-28 17:53:20 -06:00
Tim Almdal ce6d453b3f Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-28 16:51:57 -07:00
Tim Almdal 5e83ebd6d0 Use $theme->script() method to render module javascript files 2009-06-28 16:50:55 -07:00
Bharat Mediratta fcc57a4182 Modify the cache table to make id the primary key for consistency with
other gallery 3 tables.  Update the driver to match, add more upgrader
code, update the installer block and change the gallery module version
to 6.
2009-06-28 16:48:29 -07:00
Bharat Mediratta aa31e1f009 Tweak the cache implementation
1) Drop the *_modified key, we don't really need it.  The modification date is not
   relevant to our browser caching strategy.
2) Fix multiple issues with the Expires header and just hardcode it to the biggest
   possibly value for code clarity.
3) print the $content out directly instead of using fwrite
4) Minor cleanups in the installer.
2009-06-28 16:24:51 -07:00
Tim Almdal bf26ca727e Change the combined javascript to use the new caching functionality and respect the HTTP_IF_MODIFIED_SINCE header request. 2009-06-28 15:30:13 -07:00
Tim Almdal 7a3310e91b Change the cache column of the caches table to a large blob. This fixes ticket #485 and gives us the extra adavantage of not having to serialize the data (as the database driver handles that for us) 2009-06-28 13:14:47 -07:00
Tim Almdal 1c44537097 Clean up code (i.e. preamble, tabs) from the caching implementation so the unit tests pass
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-28 22:52:35 +08:00
Tim Almdal a0c07d4b54 Clean up code (i.e. preamble, tabs) from the caching implementation so the unit tests pass 2009-06-28 07:49:35 -07:00
Tim Almdal 067e9f8ef7 The rest of the caching driver implementation that i somehow forgot.
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-28 14:37:50 +08:00
Tim Almdal aa6bc97c7c Update the version number and upgrade method for gallery to reflect the addition of the cache table.
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-28 14:37:49 +08:00
Tim Almdal 5bfdd6e328 Implemented a Database driver for the Kohana Cache library. Rather then writing our own caching algorithm, we can leverage the Kohana library. This has the added advantage of allowing the administrator to replace the default caching with a 3rd party caching algorithm.
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-28 14:37:47 +08:00
Tim Almdal 2d38370ec4 The rest of the caching driver implementation that i somehow forgot. 2009-06-27 23:34:07 -07:00
Tim Almdal 3000c78998 Update the version number and upgrade method for gallery to reflect the addition of the cache table. 2009-06-27 23:30:02 -07:00
Tim Almdal 52ecdcdff2 Implemented a Database driver for the Kohana Cache library. Rather then writing our own caching algorithm, we can leverage the Kohana library. This has the added advantage of allowing the administrator to replace the default caching with a 3rd party caching algorithm. 2009-06-27 23:24:23 -07:00
Tim Almdal 4707a97b82 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-27 16:57:38 -07:00
Bharat Mediratta 76f688a070 Clean up poor english. Use the latest recaptcha info from their website. Fixes ticket #470. 2009-06-27 16:41:05 -07:00
Bharat Mediratta aad0dd357f Create a new thumb_menu() and convert Digibug over to use it.
1) Eliminate digibug_album.html

2) Get rid of the $(document).ready() in digibug.js and rename popUp() to
   digibug_popup() then just make direct calls to digibug_popup() in the
   menu urls.
2009-06-27 16:29:09 -07:00
Bharat Mediratta 2fbc03437a Digibug simplification cleanup. Upgrade digibug module to version 2.
1) Simplify the admin settings page to what most of our users
   want. Eliminate basic_ and default_ ids.  We just have company_id
   and default_id.  Advanced users can use advanced settings for now.

2) Fix security in print_photos (didn't get it right in my last commit)

3) Use the regular thumb and full urls if the images are publicly
   available to reduce load on the proxy.

4) Simplify proxy expiration code.

5) Eliminate all specialized styles from the admin theme.
2009-06-27 15:55:47 -07:00
Bharat Mediratta f98b7dc631 Require view_full to print photos. 2009-06-27 14:43:40 -07:00
Bharat Mediratta 6a8dc91f9f Remove empty upgrade(). 2009-06-27 14:35:53 -07:00