From 9c06bb55645c314541fdcff9e9611b38ca0694ac Mon Sep 17 00:00:00 2001 From: rvelices Date: Mon, 2 Apr 2012 20:49:46 +0000 Subject: - comment edit form looks ok now with the new comment layout - removed unused css / simplify it - simplified jquery drop boxes ... git-svn-id: http://piwigo.org/svn/trunk@13865 68402e56-0260-453c-a942-63ccdbb3a9ee --- comments.php | 9 ++--- include/picture_comment.inc.php | 2 +- picture.php | 7 ++-- themes/default/fix-ie5-ie6.css | 10 ++---- themes/default/template/comment_list.tpl | 12 +++---- themes/default/template/index.tpl | 58 ++++++++++---------------------- themes/default/template/picture.tpl | 41 +++++++++------------- themes/default/theme.css | 42 ++++++++--------------- 8 files changed, 64 insertions(+), 117 deletions(-) diff --git a/comments.php b/comments.php index d1f1a27ec..5a7163fd9 100644 --- a/comments.php +++ b/comments.php @@ -206,8 +206,6 @@ foreach ($actions as $loop_action) if (isset($action)) { - check_pwg_token(); - $comment_author_id = get_comment_author_id($comment_id); if (can_manage_comment($action, $comment_author_id)) @@ -216,12 +214,14 @@ if (isset($action)) if ('delete' == $action) { + check_pwg_token(); delete_user_comment($comment_id); $perform_redirect = true; } if ('validate' == $action) { + check_pwg_token(); validate_user_comment($comment_id); $perform_redirect = true; } @@ -230,6 +230,7 @@ if (isset($action)) { if (!empty($_POST['content'])) { + check_pwg_token(); update_user_comment( array( 'comment_id' => $_GET['edit'], @@ -502,8 +503,7 @@ SELECT c.id, name, permalink, uppercats, com.id as comment_id $tpl_comment['U_EDIT'] = add_url_params( $url, array( - 'edit' => $comment['comment_id'], - 'pwg_token' => get_pwg_token(), + 'edit' => $comment['comment_id'] ) ); @@ -514,6 +514,7 @@ SELECT c.id, name, permalink, uppercats, com.id as comment_id $tpl_comment['KEY'] = $key; $tpl_comment['IMAGE_ID'] = $comment['image_id']; $tpl_comment['CONTENT'] = $comment['content']; + $tpl_comment['PWG_TOKEN'] = get_pwg_token(); } } diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php index 2e5c0d518..b6680aaf8 100644 --- a/include/picture_comment.inc.php +++ b/include/picture_comment.inc.php @@ -198,7 +198,6 @@ SELECT array( 'action'=>'edit_comment', 'comment_to_edit'=>$row['id'], - 'pwg_token' => get_pwg_token(), ) ); if (isset($edit_comment) and ($row['id'] == $edit_comment)) @@ -207,6 +206,7 @@ SELECT $key = get_ephemeral_key(2, $page['image_id']); $tpl_comment['KEY'] = $key; $tpl_comment['CONTENT'] = $row['content']; + $tpl_comment['PWG_TOKEN'] = get_pwg_token(); } } if (is_admin()) diff --git a/picture.php b/picture.php index bb5c79cab..44216f49d 100644 --- a/picture.php +++ b/picture.php @@ -332,9 +332,8 @@ UPDATE '.USER_CACHE_CATEGORIES_TABLE.' rate_picture($page['image_id'], $_POST['rate']); redirect($url_self); } - case 'edit_comment' : + case 'edit_comment': { - check_pwg_token(); include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php'); check_input_parameter('comment_to_edit', $_GET, false, PATTERN_ID); $author_id = get_comment_author_id($_GET['comment_to_edit']); @@ -343,6 +342,7 @@ UPDATE '.USER_CACHE_CATEGORIES_TABLE.' { if (!empty($_POST['content'])) { + check_pwg_token(); $comment_action = update_user_comment( array( 'comment_id' => $_GET['comment_to_edit'], @@ -374,14 +374,13 @@ UPDATE '.USER_CACHE_CATEGORIES_TABLE.' redirect($url_self); } unset($_POST['content']); - break; } else { $edit_comment = $_GET['comment_to_edit']; - break; } } + break; } case 'delete_comment' : { diff --git a/themes/default/fix-ie5-ie6.css b/themes/default/fix-ie5-ie6.css index 312b64e30..eaf68a3f0 100644 --- a/themes/default/fix-ie5-ie6.css +++ b/themes/default/fix-ie5-ie6.css @@ -50,18 +50,12 @@ H1, #theHeader { } .filter LABEL INPUT, -.filter LABEL SELECT, -.filter LABEL SPAN, -.filter LABEL TEXTAREA { +.filter LABEL SELECT { display: block; margin: 0.5em 0; } .filter FIELDSET * LABEL INPUT, -.filter FIELDSET * LABEL SELECT, -.filter FIELDSET * LABEL TEXTAREA, -.filter LABEL SPAN INPUT, -.filter LABEL SPAN SELECT, -.filter LABEL SPAN TEXTAREA { +.filter FIELDSET * LABEL SELECT { display: inline; vertical-align: top; margin: 0 0.5em 0 0; diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index b73cc39e2..cb3052d11 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -43,14 +43,14 @@ {$comment.AUTHOR} - {$comment.DATE} {if isset($comment.IN_EDIT)} -
-
- {'Edit a comment'|@translate} - - + +

+

+

+ -

+

{else}
{$comment.CONTENT}
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 9e21bd41b..3f49aee06 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -7,7 +7,7 @@
  • {strip}  {'Sort order'|@translate} -
    • @@ -46,7 +35,7 @@ $(document).ready(function() {
  • {strip}  {'Photo sizes'|@translate} -
    • diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index c0f44ffa4..5450dce85 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -35,31 +35,20 @@ function changeImgSrc(url,typeSave,typeMap) document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}'; } -$(document).ready(function() { - $("#derivativeSwitchBox").css({'top':0,'left':0}); - var derivativeSwitchBox_width = $("#derivativeSwitchBox").outerWidth(true); - var derivativeSwitchBox_height = $("#derivativeSwitchBox").outerHeight(true); - - $("#derivativeSwitchLink").click(function() { - $("#derivativeSwitchBox").toggle(); - - if ($(this).offset().left + derivativeSwitchBox_width > $(window).width()) { - $("#derivativeSwitchBox").css("left", $(window).width() - derivativeSwitchBox_width - 5); - } else { - $("#derivativeSwitchBox").css("left", $(this).offset().left); - } - $("#derivativeSwitchBox").css("top", $(this).offset().top + $(this).outerHeight(true)); - }); - - $("#derivativeSwitchBox").bind("mouseleave click", function() { - $(this).hide(); - }); +$("#derivativeSwitchLink").click(function() { + var elt = $("#derivativeSwitchBox"); + elt.css("left", Math.min( $(this).offset().left, $(window).width() - elt.outerWidth(true) - 5)) + .css("top", $(this).offset().top + $(this).outerHeight(true)) + .toggle(); +}); +$("#derivativeSwitchBox").on("mouseleave click", function() { + $(this).hide(); }); {/literal}{/footer_script} {strip}  {'Photo sizes'|@translate} -