Commit Graph
193 Commits
Author SHA1 Message Date
Bharat Mediratta bca7080deb Fix typo: loading-arge.gif -> loading-large.gif 2009-09-04 20:23:00 -07:00
Bharat Mediratta 8972d5f05c Move the loading images into lib/images and adjust everything to point
at them, including jquery.autocomplete.css so that we don't have stuff
from lib that points into a theme directory.  They were common images
anyway.  Incidentally, rename sm/lg to small/large.
2009-09-03 10:21:38 -07:00
Chad Kieffer 02409d3b99 Fix bg images in tables bug in webkit and ie. #718 2009-09-02 22:35:54 -06:00
Chad Kieffer c4a53a0176 Forgot to delete admin_screen in prior commit. Done. 2009-09-01 23:25:08 -06: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
Chad Kieffer 39ca803af7 Set CSS cursor to hand for jQuery UI ui-state-hover elements. Fixes all but progress bar cursor. #669 2009-08-31 23:51:27 -06:00
Andy Staudacher 2bc73e2e36 Fix XSS vectors in HTML attributes (mostly t() calls) 2009-08-31 21:51:57 -07:00
Chad Kieffer 80ae2fe4bf Finish this pass at the Admin Maintenance view. Re-introduce status icons, put Cancel All, Delete All buttons in the action heading cell. 2009-08-30 23:51:31 -06:00
Chad Kieffer ce733e0f48 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-30 22:33:12 -06:00
Chad Kieffer 138ef5d65c Remove jquery.dropshadow. It's only used in one place, not worth keeping. 2009-08-30 21:57:04 -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
Chad Kieffer a9fcec755a Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-29 14:02:29 -06:00
Chad Kieffer 5db0b68a70 Update status message styles. Lighten backgrounds, don't show background on Admin Maintenance rows, and added gModuleStatus class. 2009-08-29 14:01:04 -06:00
jhilden b518a5173d Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-28 20:54:20 -04:00
jhilden c234f9fd39 improved translations admin interface 2009-08-28 20:53:06 -04:00
Chad Kieffer d1a44af862 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-28 15:50:52 -06:00
Chad Kieffer c428e49f32 Make gMessage 100% of the width of its container. 2009-08-28 15:24:21 -06:00
jhilden 1855642bd1 improved UI for the languages admin
this should take care of bug #329
2009-08-28 16:19:41 -04: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 e4eec71efa Rename gallery.common.js functions to conform to our naming standards
and have some basic namespacing:
  showMessage --> gallery_show_message
  vAlign      --> gallery_valign
  showLoading --> gallery_show_loading

Convert gallery.show_full_size.js to be a jQuery function and give it a namespace:
  show_full_size --> gallery_show_full_size
2009-08-07 11:53:40 -07:00
Tim AlmdalandBharat Mediratta 445a8fb1b6 Change galleryPanel and galleryDialog widgets to gallery_panel and gallery_dialog respectively
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-08-08 02:08:42 +08:00
Tim AlmdalandBharat Mediratta a302a9c3fa Refactor the gallery dialog into a jQuery widget
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-08-08 02:08:28 +08:00
Tim Almdal 6abcc06e21 Refactor the gallery.panel.js as a jQuery widget.
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-08-07 21:22:14 +08:00
Tim Almdal b826182b7a Cleanup the javascript for enabling dialog or panel links.
1) We don't need to loop over the elements to bind the event handler.
2) Just include gallery.panel.js for all the admin pages.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-08-06 22:28:05 +08:00
Tim Almdal 9f396178ce Revert "Allow a theme to override the page refresh mechanism. Create a new"
This reverts commit 1f014aae6c.
2009-08-05 09:24:27 -07:00
Tim Almdal 1f014aae6c Allow a theme to override the page refresh mechanism. Create a new
javascript lib (gallery.reload.js) which defines the functions
gallery_reload() and gallery_location(new_location).  They just
do a window.location.reload() and window.location = new_location.

This change breaks the assumption that all themes will handle page reloads
the same and allows the theme to customize the page refresh.
2009-07-27 12:39:12 -07:00
Bharat Mediratta 6246a91797 Add in more images referenced by CSS that I forgot to copy over from the default theme when I combined the CSS 2009-07-23 17:33:57 -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 050c82cf80 Escape bare & symbols so that we use valid entities. Fixes ticket #577. 2009-07-21 11:09:23 -07:00
Bharat Mediratta e2a9a1d284 Add quotes around all values that contain spaces in them, and add a
test to make sure that we continue to do so.

This makes sure that we don't have problems with 5.3 which treats the
literal "on" as a boolean.
2009-07-13 10:36:55 -07:00
Tim Almdal 04f02b49c5 Add task logging functionality. When a task runs, it creates a log that is
stored in the persistant cache for 30 days.  On the admin_maintenance page
there is a new link for completed tasks "browse log".  Clicking this will
open a dialog box that has the the contents of the log displayed.

The user can then view the log and close the dialog, or press the save button
to download the log to their local machine.
2009-07-05 17:38:49 -07:00
Bharat Mediratta f79e26b919 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-01 01:08:17 -07:00
Bharat Mediratta 9beac1132e Fix a typo in the Doctype. Fixes ticket #497. 2009-07-01 01:08:00 -07:00
jhilden b943b0f7c1 made the 'back to gallery' link in the admin a lighter grey
(and removed the commented out <img>)
2009-07-01 02:39:00 -04:00
jhilden 979d327595 change to the 'back to the Gallery' link from the admin. 2009-07-01 02:17:38 -04:00
jhilden 0b34ec4e8b UI enhancement: made the 'back to the Gallery' links a little bit easier to discover 2009-06-30 22:22:29 -04:00
Andy Staudacher 21f228b1ae Ticket 86 (addendum) - Guard against themes that don't define MSG_CANCEL and add the message to admin_default as
well.
2009-06-29 21:03:40 -07:00
Bharat Mediratta 937fd13552 Change XXX to @todo 2009-06-29 20:24:48 -07:00
Andy Staudacher e3b4c6a577 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-29 20:21:25 -07:00
Andy Staudacher fe668abcb3 Fix for ticket 481 - Better plural handling for 2 messages with multiple %count variables. 2009-06-29 20:20:15 -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 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
Tim Almdal 4707a97b82 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-27 16:57:38 -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
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