Commit Graph

101 Commits

Author SHA1 Message Date
Bharat Mediratta
2aad580f53 Move specialized (pretty) url generation back into Item_Model so that
we're not relying on overriding url::site() to do tricks around item
urls.  This means that you won't get item urls by doing
url::site("albums/37"), for example, but it also means that we won't
get pretty urls where we don't expect them (like in the action of a
<form> element).

Incidentally, this will help us move over to using the slug format
because if you've got a bad character in a url, the edit forms will
now work on it since they'll be id based.
2009-09-08 13:44:52 -07:00
Chad Kieffer
bc147d1c6c Merged admin_screen and screen style sheets in the admin theme. Removed some unsused admin styles in the process. Fixed problem in admin header that broke the theme's layout in IE7. Moved the Gallery logo and shortcut icon to lib/images for easier reuse. 2009-09-01 23:22:06 -06:00
Andy Staudacher
2bc73e2e36 Fix XSS vectors in HTML attributes (mostly t() calls) 2009-08-31 21:51:57 -07:00
Bharat Mediratta
74a124b261 Oops, fix up the show argument that I "fixed" in the last change. 2009-08-30 17:41:34 -07:00
Bharat Mediratta
e6c2fe60c4 Use $theme->item() instead of $item. 2009-08-30 17:17:14 -07:00
Chad Kieffer
1e79ca2dcb Move header and footer into page.html.php since they're not included in any other view template. 2009-08-30 23:22:54 -06:00
Andy Staudacher
00c73ec852 Updating uses of html::js_string and SafeString::for_js (value now contains string delimiters) 2009-08-30 15:34:46 -07:00
Andy Staudacher
a5dfc81a8f Merge commit 'upstream/master'
Conflicts:

	modules/akismet/views/admin_akismet.html.php
	modules/comment/helpers/comment_rss.php
	modules/gallery/helpers/gallery_rss.php
	modules/gallery/libraries/I18n.php
	modules/gallery/views/permissions_browse.html.php
	modules/gallery/views/simple_uploader.html.php
	modules/info/views/info_block.html.php
	modules/organize/controllers/organize.php
	modules/organize/views/organize.html.php
	modules/organize/views/organize_album.html.php
	themes/default/views/album.html.php
	themes/default/views/movie.html.php
	themes/default/views/photo.html.php
2009-08-29 14:17:48 -07:00
Andy Staudacher
d5660d2d3e Fixing all detected XSS vectors in PHP->JS code.
Xss: Rename UNKNOWN back to DIRTY, JS_XSS to DIRTY_JS.
(using a different flag value to highlight potential XSS vectors in JS)
2009-08-29 13:41:18 -07:00
Andy Staudacher
c01ac42c46 Refactor all calls of p::clean() to SafeString::of() and p::purify() to SafeString::purify().
Removing any p::clean() calls for arguments to t() and t2() since their args are wrapped in a SafeString anyway.
2009-08-29 12:48:40 -07:00
Bharat Mediratta
cbba45fffc Create the concept of an "ajax link" and use it for thumbnail rotation
and album covers in the context menu.

Notes:
- This requires context_menu() to have a CSS selector that refers to the
  <img> that we're operating on, otherwise we don't know how to find the
  thumbnail, etc.
- Create Menu_Element_Ajax_Link which has an ajax_handler attribute
  that contains a snippet of JS that we're going to run when the ajax
  call returns.
- Add $.gallery_replace_image in gallery.common.js
- Add lib/gallery.ajax.js which can be used to ajaxify any link, and have
  ui.init.js in the themes call that on all .gAjaxLink elements.
2009-08-10 23:07:50 -07:00
Bharat Mediratta
dbeadc1407 Use the Kohana cascading filesystem to locate resources loaded by the
theme.  Because the theme comes first, this means that themes can
override any module resources, at the cost that we no longer have
namespacing for JS and CSS files.

The only file getting used outside of this model is
themes/default/screen.css which is used in the admin theme.  I fixed
that by copying screen.css into admin_default and renaming its
screen.css to admin_screen.css.  I also copied over all the images
that it was referencing.

Fixes tickets #48 and #539.

Theme API changes:
- theme_script(), theme_url() and theme_css() are no longer needed
- script(), url() and css() now refer to the first matching asset in
  the module load path, where gallery3/lib is at the end of the path
2009-07-22 14:27:57 -07:00
Bharat Mediratta
9beac1132e Fix a typo in the Doctype. Fixes ticket #497. 2009-07-01 01:08:00 -07:00
Andy Staudacher
0eb9a2aacd Fix for ticket 86 - Make Cancel button in doalogs localizable. 2009-06-29 20:55:23 -07:00
Bharat Mediratta
f5f74e3638 Remove fix-ie.css scripts from the combined bundle, since we only want
to load them conditionally.
2009-06-29 20:12:27 -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
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
Tim Almdal
42a5bd20a5 1) Move the generation of script tags to gallery_theme::head and gallery_theme::admin_head. This allows us to potentially manage the scripts like we do in g2 (single file and compressed)
2) Change Theme_View::_call to always call the gallery_theme::$function first.
2009-06-26 07:51:29 -07:00
Tim Almdal
1dccc0286f Change the page.html file so that if the type of page is login, the sidebar contents are are not shown 2009-06-16 22:09:02 -07:00
Tim Almdal
b6c3451231 Fix the bug introduced by r79582ee, where we try to set the title of the tag album to tag->title. which doesn't exist. 2009-06-15 20:47:36 -07:00
Bharat Mediratta
79582ee5bf Fix up the titles in the default theme. They've been broken for a
while.  This fixes ticket #342.

The bug is that we were using $item instead of $theme->item().  But we
were also not special casing tags properly, and they are effectively
first class citizens (at least for now) so treat them properly.  Also,
set page_title by default in the theme so that we don't have to do an
empty() check on it (makes the theme easier to read) and move the
title out of Tags_Controller so that the theme has more control over
it.
2009-06-15 18:15:41 -07:00
Chad Kieffer
3d4cbfa274 Move jquery local scroll module from default theme to lib, only load it if viewing photo view. White space cleanup, removed debug print from template. 2009-06-14 22:39:12 -06:00
Bharat Mediratta
f7a720d2e8 Rename main_element_attributes() callback to body_attributes() to be
more intuitive for themers.
2009-06-08 23:17:28 -07:00
Andy Staudacher
0e415dae9b Preliminary BiDi support (needs *a lot* of tweaking) 2009-06-06 15:24:14 -07:00
Bharat Mediratta
e30b45be07 Merge branch 'master' of git://github.com/gallery/gallery3 2009-05-31 01:15:11 -07:00
Bharat Mediratta
2e16c9557c Run all variables containing user-entered text through p::clean() 2009-05-31 01:06:51 -07:00
Chad Kieffer
b4b6a0b8d4 Focus IE fixes on versions less than 8 2009-05-30 21:49:55 -06:00
Chad Kieffer
88e1f02c1a Split out re-used JavaScript for common functions (messages, valign), panel toggle, and forms to external files. 2009-05-26 03:59:35 +00:00
Chad Kieffer
b4bca043ac Added method to determine proportion of current thumb_size to the default, 150. Use this in the the default theme, or any other, to reduce the size of CSS widths and heights in albums, including .gItem. 2009-04-22 05:31:29 +00:00
Tim Almdal
863e353911 rollback of r20469... see trac #161 2009-03-20 17:20:17 +00:00
Tim Almdal
48c022e8cb Rather than moving the themeroller and all of its associated files
into each theme.  I chose to create methods Theme_View::file($path)
and Admin_View::file($path).  These methods check for a theme override
file in the theme and return a link to it if it exists.  So to
override the themeroller files. just create a lib/themeroller in the
theme and the files will be picked up.
2009-03-20 14:59:55 +00:00
Chad Kieffer
3dbf9e1c82 Remove YUI grids hd and ft ids, we don't need and they're cluttering our HTML. 2009-03-19 16:01:41 +00:00
Tim Almdal
85f2c6b666 Move the setting of the page title into the controller that is
creating the page.  Provide for a default page title if none is
set. This allows less changes to page.html.php as different modules
want to change the page title.
2009-03-12 16:06:13 +00:00
Tim Almdal
e58b955d4a Bag the header("Location:", ...);exit() and replace with
url:site(url::abs_file(...))
Create a login_page.html to be used when there is no guest access to
the root album. It doesn't have a sidebar nor breadcrumb.
2009-03-11 21:07:21 +00:00
Tim Almdal
a521d9177f Force a login if everybody does not have access to the root
item. ticket #118.
2009-03-11 13:58:38 +00:00
Chad Kieffer
d487558369 Fixed gViewMenu button issues. Fixed major admin_default theme issues, content now clears the menu. Added IE-specific stylesheet to admin theme. 2009-02-12 04:25:43 +00:00
Bharat Mediratta
053fa63fa1 Superfish is now in gallery3/trunk/lib/superfish 2009-02-08 23:51:59 +00:00
Chad Kieffer
f7d226bd31 Move jQuery UI ThemeRoller css and images to lib. Should simplify future updates, keep default theme directories clean. 2009-02-08 19:17:19 +00:00
Bharat Mediratta
b1effc1d35 Drop request for jquery.listen.js, we don't use it 2009-02-04 23:37:20 +00:00
Chad Kieffer
88246de0ff Add all the files jquery ui needs, including css for each widget. ui.all.css includes calls to the widget css we're currently using. Add new widget css here. 2009-01-12 00:22:55 +00:00
Chad Kieffer
e82afcebfa Site message placement and style adjustments. 2009-01-10 19:33:01 +00:00
Chad Kieffer
7569b39802 Updated to jquery ui 1.6rc4. Lots of changes, improved widget theme css and icons. No need to fix position dialogs anymore. Included the following in the combined file + i18n files. Requires push back up to vendor branch.
UI Core
Effects Core
Draggable - Req'd by Sortable
Resizeable - Image/watermark/avatar scaling
Sortable - Rearrange
Dialog - All over :)
Datepicker - Edit albums/items
Progressbar
Highlight - Message display, comment addition
Transfer - Adding tags from available list to field


Not fully integrated into the default theme yet.
2009-01-10 06:25:44 +00:00
Andy Staudacher
a631fe29f3 i18n refactoring: Rename all _() (reserved by gettext) calls to t().
- And refactor printf to our string interpolation / pluralization syntax
- Also, a slight change to the translations_incomings table, using binary(16) instead of char(32) as message key.
2009-01-08 17:13:06 +00:00
Chad Kieffer
bdff96bd54 Added a jump to comments button with a scroll to effect. 2009-01-03 19:09:32 +00:00
Chad Kieffer
7db1758e93 More admin menu cleanup to reduce it's height. Removed redundant admin theme images, these are included in the default theme. Added a favicon. 2009-01-02 22:06:12 +00:00
Bharat Mediratta
cd1d023754 Change the preamble for views in two ways:
1) drop unnecessary semicolon
2) start with <?php for extra security in the case that the server itself doesn't
   have short_tags enabled (the app won't work, but we need to make sure that we're
   still secure)
2009-01-01 00:23:29 +00:00
Bharat Mediratta
11d2788af8 Refactor common dialog JS code out into lib/gallery.dialog.js 2009-01-01 00:06:52 +00:00
Chad Kieffer
37f9cc2872 Missed these in r19485. 2008-12-30 00:52:03 +00:00