Commit Graph

90 Commits

Author SHA1 Message Date
shadlaws
a1b5cf2e8d #2051 - Revise how Gallery_View returns combined JS and CSS.
Changed Gallery_View's JS and CSS combining to:
- have get_combined() combine all groups if called without arguments.
- ensure the "core" group is combined first.
- always put links where get_combined() is called, even if combining is disabled (otherwise the order isn't preserved).
- add key as cache buster when combining is disabled.
- make "LOOKING FOR YOUR CSS/JAVASCRIPT..." comments in get_combined(), not in the theme itself.
Also, revised xss_data.txt golden file (line number changes only).
2013-03-12 15:00:59 +01:00
Bharat Mediratta
53c1ae7dca Merge pull request #204 from jozefs/issue1838
#1838 - thumb_proportion should have a minimum size.
2013-03-11 16:38:53 -07:00
shadlaws
2e94edab53 #2053 - Change all .bind() to .on() for jQuery future-proofing.
- on/off are preferred to bind/unbind, live/die, and delegate/undelegate in jQuery 1.7+
- they're likely on the road toward deprecation, so let's replace them now.
2013-03-11 17:16:20 +01:00
Jozef Selesi
3c47deb9ef Themes can choose child thumbnail when asking for proportion.
This helps themes better calculate an item's container size, for cases
when the first item significantly differs in size from the rest.

Trac-Ticket: #1838
2013-03-11 15:59:00 +01:00
Jozef Selesi
bae14a76e5 Themes can set minimum thumbnail size when calculating proportions.
This prevents broken item rendering when thumbnails are smaller than the
theme design allows.

Trac-Ticket: #1838
2013-03-11 15:54:20 +01:00
shadlaws
a517d9a33a Follow-on to #2033 - Change variables and js script loading for Flash Flowplayer.
- changed movie_img event variable names to have "flash" in them.
- moved flowplayer.js loading from page.html.php to movieplayer-flash.
- removed conditional loading for small, photo-specific JS files in page.html.php
to keep combined JS consistent between page types (better for caching).
2013-03-04 23:44:50 +01:00
shadlaws
384bc7afc8 #2033 - Add Flowplayer 5 to play HTML5 videos.
- add Flowplayer 5 to lib/flowplayer-html5
- move existing Flash Flowplayer to lib/flowplayer-flash
- update page.html.php and movieplayer.html.php

--HG--
rename : lib/flowplayer.controls.swf => lib/flowplayer-flash/flowplayer.controls.swf
rename : lib/flowplayer.js => lib/flowplayer-flash/flowplayer.js
rename : lib/flowplayer.pseudostreaming-byterange.swf => lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf
rename : lib/flowplayer.pseudostreaming.swf => lib/flowplayer-flash/flowplayer.pseudostreaming.swf
rename : lib/flowplayer.swf => lib/flowplayer-flash/flowplayer.swf
2013-03-02 23:56:13 +01:00
Bharat Mediratta
50f5286ffb Elevate X-Frame-Options from all admin and user pages to all PHP
responses.  Fixes #1922.
2012-11-06 11:51:44 -08:00
Bharat Mediratta
7a53cebd29 Don't show the sidebar on error pages - it just increases the chances
that we'll compound the error.  Instead, focus on the error or the
login form.  Fixes #1921.
2012-11-01 09:51:35 -07:00
Bharat Mediratta
68437993b9 Differentiate between photos and movies in album children. Fixes #1861. 2012-05-19 10:54:02 -07:00
Bharat Mediratta
b839be36bf Add "X-Frame-Options: SAMEORIGIN" to all pages. Fixes #1850. 2012-05-05 21:24:25 -07:00
Bharat Mediratta
581d9a58db Clean up title handling code in organize and wind theme for consistency.
Fixes #1847.
2012-05-05 19:38:31 -07:00
Bharat Mediratta
1189ced2ce Revert "Fix a bug introduced in dc21cf36b6 where"
It doesn't work for search because there are no children.  And this
just feels clunky to me - we should arrange for the root album to have
the right dimensions of thumbnail instead.

This reverts commit 4cb49b9152.
2011-11-03 21:11:15 -07:00
Bharat Mediratta
4cb49b9152 Fix a bug introduced in dc21cf36b6 where
we're basing the thumb proportions on the album's thumbnail, but this
will be messed up in the case of the root album which may not have a
properly update thumbnail, so its proportions may not be
representative of the album's contents.  So instead, base the thumb
proportions on the first child of the album.
2011-11-03 20:05:53 -07:00
Tim Almdal
91bdcfe1c5 Close the breadcrumb list 2011-10-02 15:34:37 -07:00
Bharat Mediratta
084c2717c0 Merge branch 'master' into bharat_dev 2011-08-27 20:56:03 -07:00
Tim Almdal
dd0b622ae9 Initial commit of a patch for Ticket #1764. as discussed here: https://github.com/gallery/gallery3/pull/58/files#r72949.
Create a Breadcrumb library which has two static methods for_item (which takes a an item and builds the entire
breadcrumb for the item) or build (which takes a variable number of Breadcrumb elements and creates a breadcrumb
based on the specified elements).

Used tag->url() to build the tag album url. Escaped the query string for the search. Tightened up the breadcrumb code
 in page.html.php.

When adding the show query parameter, we can't blindly concatenate using the ? separator.  We have to check that we
use a & if a query parameter already exists.
2011-08-07 13:41:47 -07:00
Chad Kieffer
4fa46d6a04 Move wind and admin_wind RTL style definitions out to their own file. Call that file when an RTL language is selected. 2011-04-26 22:38:53 -06:00
Chad Kieffer
3bce5d00ee Renamed apple_touch_url to apple_touch_icon_url. 2011-04-22 12:50:21 -04:00
Chad Kieffer
4a9b45c9c3 Created apple-touch-icon and added to wind and admin_wind themes. 2011-04-22 12:37:28 -04:00
Bharat Mediratta
dc21cf36b6 Change the $thumb_proportions variable to be a theme callback which
takes an item as an argument.  This will let us figure out proportions
in the case where a module has defined custom thumbnail sizes.
2011-03-20 10:25:59 -07:00
Bharat Mediratta
bda14f29ea Put external CSS before external JS, per:
http://code.google.com/speed/page-speed/docs/rtt.html#PutStylesBeforeScripts

ref:
http://gallery.menalto.com/node/100693

Thanks Serge!

Fixes #1633.
2011-03-05 15:59:52 -08:00
Bharat Mediratta
08c41f2976 Add "html_attributes" theme callback to allow modules to inject attributes into
the <html> element, including things like namespaces.   Fixes #1615.
2011-01-21 00:07:00 -08:00
Bharat Mediratta
5ac49d497f Create new APIs for allowing themers to control what CSS/JS get
combined and when.  Backwards compatible in that old themes will work,
but their CSS/JS will no longer be combined unless they make some
changes.  Fixes #1600.
2011-01-10 22:20:12 -08:00
Bharat Mediratta
e760200eee Identify the case where the active sidebar blocks didn't produce any
content and print out a more informative message in that case.  Fixes
2010-12-31 22:49:57 -08:00
Bharat Mediratta
dd6da5e233 Add a minified version of json2.js from https://github.com/douglascrockford/JSON-js/blob/master/json2.js
by Douglas Crockford at 8d11dc6950eafc7d01f141ce91d4f585caa29f3b.  Fixes #1351.
2010-12-29 11:59:44 -08:00
Bharat Mediratta
c989981041 Use the item title wherever possible as the page title and get rid of
the "Browse Album" text which shows up way too much.  Fixes #1520.
2010-12-24 00:38:25 -08:00
Tim Almdal
8b21123493 When the lib/gallery.common.css was combined, the image urls did not point to the correct location.
So lets fix that up. But first undo the reverts:
93d1a8103e "Revert 'Move the contents of lib/gallery.common.css into themes/wind/css/screen.php and themes/admin_wind/css/screen.php.  Most themers seem to copy the contents into their theme's screen.css anyway.'"
f14290f34f "Revert 'Clean up white space'"
ff8ee5bdfc "Revert 'Add some whitespace.'"
2010-09-19 07:53:39 -07:00
Bharat Mediratta
93d1a8103e Revert "Move the contents of lib/gallery.common.css into themes/wind/css/screen.php and themes/admin_wind/css/screen.php. Most themers seem to copy the contents into their theme's screen.css anyway."
This reverts commit 4251704175.
2010-09-18 17:51:25 -07:00
Tim Almdal
4251704175 Move the contents of lib/gallery.common.css into themes/wind/css/screen.php and themes/admin_wind/css/screen.php. Most themers seem to copy the contents into their theme's screen.css anyway. 2010-09-15 18:20:27 -07:00
Bharat Mediratta
32878ebfdc Replace the hook function hack I introduced in
cbba45fffc with a namespaced jQuery
custom event.  This is way more portable.
2010-09-09 21:04:18 -07:00
Bharat Mediratta
c51b6ab38d Fix full size dimensions after rotating an image on the photo view page.
The photo view page caches the dimensions of the full size and then
renders it in Javascript.  But after rotation, those dimensions are no
longer valid.  Create a new function on the items controller that
returns the appropriate dimensions, then add a hook on
$.gallery_replace_image and implement the hook on the photo view page
to have it make an async call to get the new dimensions.

Fixes ticket #1317
2010-09-04 15:54:07 -07:00
Bharat Mediratta
077cf53714 Don't try to compare ORM instances; compare their ids instead.
Follow on to the fix for #1318 that caused the show= param to get
dropped in the breadcrumbs.  See http://gallery.menalto.com/node/97790
2010-09-02 22:03:16 -07:00
Bharat Mediratta
d5ebcb91ad Don't put in an <img> tag for non-existent thumbnails. Fixes ticket #1211. 2010-08-30 20:49:14 -07:00
Bharat Mediratta
4c8445852d Bump gallery module to v36 and add a favicon_url variable, which we
expose in Admin > Appearance > Theme Options and defaults to
lib/images/favicon.ico.

Thix fixes ticket #1312.
2010-08-29 16:27:32 -07:00
Bharat Mediratta
a08cd0db4e Add a "visible_title_length" variable that defaults to 15 and use that
as the max title length when we do title truncation in the wind theme.
Bump the gallery module to 35.
2010-08-28 21:58:28 -07:00
Chad Kieffer
04c89ef7b6 Minor Wind IE tweaks. Load fix-ie.css for IE 8 too. Add padding to g-short-form submit inputs to make them same height as the text input. 2010-07-18 00:25:56 -06:00
Bharat Mediratta
fe2881a22a Rename Flash_Uploader to just Uploader. Modules that want to replace
this will just replace the controller.  This makes overriding that
much easier in the future.
2010-07-15 12:37:44 -07:00
Bharat Mediratta
4c77f9ebde When limiting the length of album titles, purify after truncating so
that the truncation happens on entity boundaries.  Fixes ticket #1184.
2010-07-10 08:34:08 -07:00
Bharat Mediratta
d82863421d Rename "simple_uploader" to "flash_uploader" to make room for an HTML
uploader.
2010-06-20 21:10:22 -07:00
Bharat Mediratta
66bea24482 Use text::limit_chars() to keep individual elements in breadcrumbs
from going over 15 chars.  Fixes ticket #1108.
2010-06-20 11:59:46 -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
Bharat Mediratta
6b01022a97 Hide the admin menu and show it after it's loaded to minimize flicker.
Normalize the comment text about this interaction between admin_wind
and wind.
2010-06-13 20:44:13 -07:00
Bharat Mediratta
1240878df0 Fix-ups for d98b85f7d3
- Pass the CSS selector of the active image in as an arg to site_menu
  so that quick operations know what they're operating on.
- Change the ids from g-{photo,movie}-id to the generic g-item-id
- Initialize ajax handlers for site menu on the photo and movie page
- Drop the movie context menu, it's now in the site menu
2010-05-14 16:55:15 -07:00
ckieffer
d98b85f7d3 Drop context_menu for wind's photo/resize view. Move photo edit options to the site_menu. 2010-05-14 17:14:34 -06:00
Chad Kieffer
e8eb23db42 Increase specificity for .g-item width to ensure it overrides the wind theme's default width when thumbnails are something other than the default. Fixes ticket #1053. 2010-03-20 14:55:41 -06:00
Romain LE DISEZ
06d0ed57a7 Fix a typo. 2010-03-03 02:32:49 +08:00
Andy Staudacher
2dad1d7cd1 Some HTML validation fixes (don't render empty <ul> lists, empty id attributes, use &amp; not &) 2010-02-14 07:15:57 -08:00
Andy Staudacher
be5f38adea Minir l10n message cleanup. Avoid <br/> in messages since the server normalizes them to <br />, i.e. leading to a mismatch. 2010-01-31 14:03:32 -08:00
Bharat Mediratta
8b7ef66065 Don't show the breadcrumb if we have no item 2009-11-25 14:50:04 -08:00