Permalink
Browse files

Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

  • Loading branch information...
2 parents 4cc24a8 + 8060a8a commit c69d19951f688e0ee7a20df72869e12ef9d46592 @bharat bharat committed Sep 27, 2009
Showing with 954 additions and 767 deletions.
  1. +6 −7 lib/gallery.common.css
  2. +17 −14 lib/gallery.common.js
  3. +10 −1 lib/gallery.show_full_size.js
  4. +12 −0 modules/comment/js/comment.js
  5. +1 −1 modules/comment/views/comments.html.php
  6. +0 −8 modules/exif/helpers/exif_event.php
  7. +115 −104 modules/exif/lib/exif.php
  8. +117 −117 modules/exif/lib/makers/canon.php
  9. +59 −59 modules/exif/lib/makers/fujifilm.php
  10. +38 −38 modules/exif/lib/makers/nikon.php
  11. +2 −2 modules/exif/lib/makers/olympus.php
  12. +84 −84 modules/exif/lib/makers/panasonic.php
  13. +6 −6 modules/exif/lib/makers/sanyo.php
  14. +17 −15 modules/gallery/controllers/admin_languages.php
  15. +2 −1 modules/gallery/controllers/albums.php
  16. +2 −2 modules/gallery/controllers/movies.php
  17. +3 −2 modules/gallery/helpers/album.php
  18. +30 −3 modules/gallery/helpers/gallery.php
  19. +32 −0 modules/gallery/helpers/gallery_error.php
  20. +54 −0 modules/gallery/helpers/gallery_graphics.php
  21. +14 −3 modules/gallery/helpers/gallery_installer.php
  22. +12 −9 modules/gallery/helpers/gallery_task.php
  23. +4 −91 modules/gallery/helpers/graphics.php
  24. +30 −0 modules/gallery/helpers/movie.php
  25. +3 −2 modules/gallery/helpers/photo.php
  26. +3 −0 modules/gallery/hooks/init_gallery.php
  27. +3 −3 modules/gallery/libraries/Admin_View.php
  28. +2 −2 modules/gallery/libraries/Theme_View.php
  29. +1 −1 modules/gallery/module.info
  30. +2 −2 modules/gallery/tests/Xss_Security_Test.php
  31. +88 −88 modules/gallery/tests/xss_data.txt
  32. +2 −2 modules/gallery/views/admin_maintenance_show_log.html.php
  33. +17 −16 modules/gallery/views/permissions_form.html.php
  34. +20 −46 modules/gallery/views/simple_uploader.html.php
  35. +75 −0 modules/watermark/helpers/watermark_graphics.php
  36. +13 −0 robots.txt
  37. 0 themes/{admin_default → admin_wind}/css/fix-ie.css
  38. 0 themes/{admin_default → admin_wind}/css/screen.css
  39. BIN themes/{admin_default → admin_wind}/images/avatar.jpg
  40. BIN themes/{admin_default → admin_wind}/images/ico-album.png
  41. BIN themes/{admin_default → admin_wind}/images/ico-error.png
  42. BIN themes/{admin_default → admin_wind}/images/ico-info.png
  43. BIN themes/{admin_default → admin_wind}/images/ico-print.png
  44. BIN themes/{admin_default → admin_wind}/images/ico-separator.gif
  45. BIN themes/{admin_default → admin_wind}/images/ico-success.png
  46. BIN themes/{admin_default → admin_wind}/images/ico-view-comments.png
  47. BIN themes/{admin_default → admin_wind}/images/ico-view-fullsize.png
  48. BIN themes/{admin_default → admin_wind}/images/ico-view-hybrid.png
  49. BIN themes/{admin_default → admin_wind}/images/ico-view-slideshow.png
  50. BIN themes/{admin_default → admin_wind}/images/ico-warning.png
  51. +1 −1 themes/{admin_default → admin_wind}/js/ui.init.js
  52. +1 −1 themes/{admin_default → admin_wind}/theme.info
  53. BIN themes/{admin_default → admin_wind}/thumbnail.png
  54. 0 themes/{admin_default → admin_wind}/views/admin.html.php
  55. 0 themes/{admin_default → admin_wind}/views/block.html.php
  56. 0 themes/{admin_default → admin_wind}/views/pager.html.php
  57. 0 themes/{default → wind}/css/fix-ie.css
  58. +40 −9 themes/{default → wind}/css/screen.css
  59. BIN themes/{default → wind}/images/avatar.jpg
  60. BIN themes/{default → wind}/images/ico-album.png
  61. BIN themes/{default → wind}/images/ico-denied-gray.png
  62. BIN themes/{default → wind}/images/ico-denied-pale.png
  63. BIN themes/{default → wind}/images/ico-denied.png
  64. BIN themes/{default → wind}/images/ico-error.png
  65. BIN themes/{default → wind}/images/ico-help.png
  66. BIN themes/{default → wind}/images/ico-info.png
  67. BIN themes/{default → wind}/images/ico-lock.png
  68. BIN themes/{default → wind}/images/ico-print.png
  69. BIN themes/{default → wind}/images/ico-separator.gif
  70. BIN themes/{default → wind}/images/ico-success-gray.png
  71. BIN themes/{default → wind}/images/ico-success-pale.png
  72. BIN themes/{default → wind}/images/ico-success.png
  73. BIN themes/{default → wind}/images/ico-view-comments.png
  74. BIN themes/{default → wind}/images/ico-view-fullsize.png
  75. BIN themes/{default → wind}/images/ico-view-hybrid.png
  76. BIN themes/{default → wind}/images/ico-view-slideshow.png
  77. BIN themes/{default → wind}/images/ico-warning.png
  78. BIN themes/{default → wind}/images/select-photos-backg.png
  79. +15 −26 themes/{default → wind}/js/ui.init.js
  80. +1 −1 themes/{default → wind}/theme.info
  81. BIN themes/{default → wind}/thumbnail.png
  82. 0 themes/{default → wind}/views/album.html.php
  83. 0 themes/{default → wind}/views/block.html.php
  84. 0 themes/{default → wind}/views/dynamic.html.php
  85. 0 themes/{default → wind}/views/movie.html.php
  86. 0 themes/{default → wind}/views/page.html.php
  87. 0 themes/{default → wind}/views/pager.html.php
  88. 0 themes/{default → wind}/views/photo.html.php
  89. 0 themes/{default → wind}/views/sidebar.html.php
View
@@ -12,17 +12,16 @@
* 1) Text
**********************************************************************/
-
.g-txt-small {
- font-size: .8em;
+ font-size: .8em;
}
.g-txt-big {
- font-size: 1.2em;
+ font-size: 1.2em;
}
.g-txt-right {
- text-align: right;
+ text-align: right;
}
/** *******************************************************************
@@ -99,7 +98,7 @@ form .g-error {
.g-draggable,
.ui-draggable {
- cursor: move;
+ cursor: move;
}
.g-target {
@@ -110,11 +109,11 @@ form .g-error {
**********************************************************************/
.g-right {
- float: right;
+ float: right;
}
.g-left {
- float: left;
+ float: left;
}
.g-first {
View
@@ -112,21 +112,24 @@
};
$.fn.gallery_context_menu = function() {
- var in_progress = 0;
- $(".gContextMenu *").removeAttr('title');
- $(".gContextMenu ul").hide();
- $(".gContextMenu").hover(
- function() {
- if (in_progress == 0) {
- $(this).find("ul").slideDown("fast", function() { in_progress = 1; });
- $(this).find(".gDialogLink").gallery_dialog();
- $(this).find(".gAjaxLink").gallery_ajax();
+ if ($(".gContextMenu li").length) {
+ var hover_target = ".gContextMenu";
+ var in_progress = 0;
+ $(hover_target + " *").removeAttr('title');
+ $(hover_target + " ul").hide();
+ $(hover_target).hover(
+ function() {
+ if (in_progress == 0) {
+ $(this).find("ul").slideDown("fast", function() { in_progress = 1; });
+ $(this).find(".gDialogLink").gallery_dialog();
+ $(this).find(".gAjaxLink").gallery_ajax();
+ }
+ },
+ function() {
+ $(this).find("ul").slideUp("slow", function() { in_progress = 0; });
}
- },
- function() {
- $(this).find("ul").slideUp("slow", function() { in_progress = 0; });
- }
- );
+ );
+ }
};
$.gallery_auto_fit_window = function(imageWidth, imageHeight) {
@@ -15,7 +15,16 @@
'-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
'-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
- var image_size = $.gallery_auto_fit_window(image_width, image_height);
+ var image_size;
+ if (image_width >= size.width() - 6 || image_height >= size.height() - 6) {
+ image_size = $.gallery_auto_fit_window(image_width, image_height);
+ } else {
+ image_size = {
+ top: Number((height - image_height) / 2), left: Number((width - image_width) / 2),
+ width: Number(image_width), height: Number(image_height)
+ };
+ }
+
$("body").append('<div id="gFullsize" class="ui-dialog ui-widget" ' +
'style="overflow: hidden; display: block; ' +
@@ -10,6 +10,18 @@ $("document").ready(function() {
});
}
});
+ $("#gNoComments").click(function(event) {
+ event.preventDefault();
+ if (!$("#gAddCommentForm").length) {
+ $.get($(this).attr("href"),
+ {},
+ function(data) {
+ $("#gCommentDetail").append(data);
+ ajaxify_comment_form();
+ });
+ $("#gNoCommentsYet").remove();
+ }
+ });
});
function ajaxify_comment_form() {
@@ -8,7 +8,7 @@ class="gButtonLink ui-corner-all ui-icon-left ui-state-default right">
<? if (!$comments->count()): ?>
<p id="gNoCommentsYet">
<?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
- array("attrs" => html::mark_clean("href=\"#add_comment_form\" class=\"showCommentForm\""))) ?>
+ array("attrs" => html::mark_clean("id= \"gNoComments\" href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>
</p>
<? endif ?>
<ul>
@@ -18,14 +18,6 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class exif_event_Core {
- static function gallery_ready() {
- if (!function_exists("gettext")) {
- function gettext($message) {
- return (string) t($message);
- }
- }
- }
-
static function item_created($item) {
if (!$item->is_album()) {
exif::extract($item);
Oops, something went wrong.

0 comments on commit c69d199

Please sign in to comment.