Changeset 13865
- Timestamp:
- Apr 2, 2012, 10:49:46 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
-
comments.php (modified) (6 diffs)
-
include/picture_comment.inc.php (modified) (2 diffs)
-
picture.php (modified) (3 diffs)
-
themes/default/fix-ie5-ie6.css (modified) (1 diff)
-
themes/default/template/comment_list.tpl (modified) (1 diff)
-
themes/default/template/index.tpl (modified) (4 diffs)
-
themes/default/template/picture.tpl (modified) (5 diffs)
-
themes/default/theme.css (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/comments.php
r12930 r13865 207 207 if (isset($action)) 208 208 { 209 check_pwg_token();210 211 209 $comment_author_id = get_comment_author_id($comment_id); 212 210 … … 217 215 if ('delete' == $action) 218 216 { 217 check_pwg_token(); 219 218 delete_user_comment($comment_id); 220 219 $perform_redirect = true; … … 223 222 if ('validate' == $action) 224 223 { 224 check_pwg_token(); 225 225 validate_user_comment($comment_id); 226 226 $perform_redirect = true; … … 231 231 if (!empty($_POST['content'])) 232 232 { 233 check_pwg_token(); 233 234 update_user_comment( 234 235 array( … … 503 504 $url, 504 505 array( 505 'edit' => $comment['comment_id'], 506 'pwg_token' => get_pwg_token(), 506 'edit' => $comment['comment_id'] 507 507 ) 508 508 ); … … 515 515 $tpl_comment['IMAGE_ID'] = $comment['image_id']; 516 516 $tpl_comment['CONTENT'] = $comment['content']; 517 $tpl_comment['PWG_TOKEN'] = get_pwg_token(); 517 518 } 518 519 } -
trunk/include/picture_comment.inc.php
r13773 r13865 199 199 'action'=>'edit_comment', 200 200 'comment_to_edit'=>$row['id'], 201 'pwg_token' => get_pwg_token(),202 201 ) 203 202 ); … … 208 207 $tpl_comment['KEY'] = $key; 209 208 $tpl_comment['CONTENT'] = $row['content']; 209 $tpl_comment['PWG_TOKEN'] = get_pwg_token(); 210 210 } 211 211 } -
trunk/picture.php
r13736 r13865 333 333 redirect($url_self); 334 334 } 335 case 'edit_comment' : 336 { 337 check_pwg_token(); 335 case 'edit_comment': 336 { 338 337 include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php'); 339 338 check_input_parameter('comment_to_edit', $_GET, false, PATTERN_ID); … … 344 343 if (!empty($_POST['content'])) 345 344 { 345 check_pwg_token(); 346 346 $comment_action = update_user_comment( 347 347 array( … … 375 375 } 376 376 unset($_POST['content']); 377 break;378 377 } 379 378 else 380 379 { 381 380 $edit_comment = $_GET['comment_to_edit']; 382 break;383 381 } 384 382 } 383 break; 385 384 } 386 385 case 'delete_comment' : -
trunk/themes/default/fix-ie5-ie6.css
r13774 r13865 51 51 52 52 .filter LABEL INPUT, 53 .filter LABEL SELECT, 54 .filter LABEL SPAN, 55 .filter LABEL TEXTAREA { 53 .filter LABEL SELECT { 56 54 display: block; 57 55 margin: 0.5em 0; 58 56 } 59 57 .filter FIELDSET * LABEL INPUT, 60 .filter FIELDSET * LABEL SELECT, 61 .filter FIELDSET * LABEL TEXTAREA, 62 .filter LABEL SPAN INPUT, 63 .filter LABEL SPAN SELECT, 64 .filter LABEL SPAN TEXTAREA { 58 .filter FIELDSET * LABEL SELECT { 65 59 display: inline; 66 60 vertical-align: top; -
trunk/themes/default/template/comment_list.tpl
r13801 r13865 44 44 {if isset($comment.IN_EDIT)} 45 45 <a name="edit_comment"></a> 46 <form method="post" action="{$comment.U_EDIT}" class="filter" id="editComment">47 < fieldset>48 <legend>{'Edit a comment'|@translate}</legend>49 <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>50 <input type="hidden" name=" key" value="{$comment.KEY}">46 <form method="post" action="{$comment.U_EDIT}" id="editComment"> 47 <p><label>{'Edit a comment'|@translate} :</label></p> 48 <p><textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></p> 49 <p><input type="hidden" name="key" value="{$comment.KEY}"> 50 <input type="hidden" name="pwg_token" value="{$comment.PWG_TOKEN}"> 51 51 <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}"> 52 52 <input type="submit" value="{'Submit'|@translate}"> 53 </ fieldset>53 </p> 54 54 </form> 55 55 {else} -
trunk/themes/default/template/index.tpl
r13844 r13865 8 8 <span class="pwg-icon pwg-icon-sort"> </span><span class="pwg-button-text">{'Sort order'|@translate}</span> 9 9 </a> 10 <div id="sortOrderBox" class="switchBox" style="display:none">10 <div id="sortOrderBox" class="switchBox"> 11 11 <div class="switchBoxTitle">{'Sort order'|@translate}</div> 12 12 {foreach from=$image_orders item=image_order name=loop}{if !$smarty.foreach.loop.first}<br>{/if} … … 19 19 </div> 20 20 {footer_script}{literal} 21 $(document).ready(function() { 22 $("#sortOrderBox").css({'top':0,'left':0}); 23 var sortOrderBox_width = $("#sortOrderBox").outerWidth(true); 24 var sortOrderBox_height = $("#sortOrderBox").outerHeight(true); 25 26 $("#sortOrderLink").click(function() { 27 $("#sortOrderBox").toggle(); 28 29 if ($(this).offset().left + sortOrderBox_width > $(window).width()) { 30 $("#sortOrderBox").css("left", $(window).width() - sortOrderBox_width - 5); 31 } else { 32 $("#sortOrderBox").css("left", $(this).offset().left); 33 } 34 $("#sortOrderBox").css("top", $(this).offset().top + $(this).outerHeight(true)); 35 }); 36 37 $("#sortOrderBox").bind("mouseleave", function() { 38 $(this).hide(); 39 }); 21 $("#sortOrderLink").click(function() { 22 var elt = $("#sortOrderBox"); 23 elt.css("left", Math.min( $(this).offset().left, $(window).width() - elt.outerWidth(true) - 5)) 24 .css("top", $(this).offset().top + $(this).outerHeight(true)) 25 .toggle(); 26 }); 27 $("#sortOrderBox").on("mouseleave", function() { 28 $(this).hide(); 40 29 }); 41 30 {/literal}{/footer_script} … … 47 36 <span class="pwg-icon pwg-icon-sizes"> </span><span class="pwg-button-text">{'Photo sizes'|@translate}</span> 48 37 </a> 49 <div id="derivativeSwitchBox" class="switchBox" style="display:none">38 <div id="derivativeSwitchBox" class="switchBox"> 50 39 <div class="switchBoxTitle">{'Photo sizes'|@translate}</div> 51 40 {foreach from=$image_derivatives item=image_derivative name=loop}{if !$smarty.foreach.loop.first}<br>{/if} … … 58 47 </div> 59 48 {footer_script}{literal} 60 $(document).ready(function() { 61 $("#derivativeSwitchBox").css({'top':0,'left':0}); 62 var derivativeSwitchBox_width = $("#derivativeSwitchBox").outerWidth(true); 63 var derivativeSwitchBox_height = $("#derivativeSwitchBox").outerHeight(true); 64 65 $("#derivativeSwitchLink").click(function() { 66 $("#derivativeSwitchBox").toggle(); 67 68 if ($(this).offset().left + derivativeSwitchBox_width > $(window).width()) { 69 $("#derivativeSwitchBox").css("left", $(window).width() - derivativeSwitchBox_width - 5); 70 } else { 71 $("#derivativeSwitchBox").css("left", $(this).offset().left); 72 } 73 $("#derivativeSwitchBox").css("top", $(this).offset().top + $(this).outerHeight(true)); 74 }); 75 76 $("#derivativeSwitchBox").bind("mouseleave", function() { 77 $(this).hide(); 78 }); 49 $("#derivativeSwitchLink").click(function() { 50 var elt = $("#derivativeSwitchBox"); 51 elt.css("left", Math.min( $(this).offset().left, $(window).width() - elt.outerWidth(true) - 5)) 52 .css("top", $(this).offset().top + $(this).outerHeight(true)) 53 .toggle(); 54 }); 55 $("#derivativeSwitchBox").on("mouseleave", function() { 56 $(this).hide(); 79 57 }); 80 58 {/literal}{/footer_script} -
trunk/themes/default/template/picture.tpl
r13844 r13865 36 36 } 37 37 38 $(document).ready(function() { 39 $("#derivativeSwitchBox").css({'top':0,'left':0}); 40 var derivativeSwitchBox_width = $("#derivativeSwitchBox").outerWidth(true); 41 var derivativeSwitchBox_height = $("#derivativeSwitchBox").outerHeight(true); 42 43 $("#derivativeSwitchLink").click(function() { 44 $("#derivativeSwitchBox").toggle(); 45 46 if ($(this).offset().left + derivativeSwitchBox_width > $(window).width()) { 47 $("#derivativeSwitchBox").css("left", $(window).width() - derivativeSwitchBox_width - 5); 48 } else { 49 $("#derivativeSwitchBox").css("left", $(this).offset().left); 50 } 51 $("#derivativeSwitchBox").css("top", $(this).offset().top + $(this).outerHeight(true)); 52 }); 53 54 $("#derivativeSwitchBox").bind("mouseleave click", function() { 55 $(this).hide(); 56 }); 38 $("#derivativeSwitchLink").click(function() { 39 var elt = $("#derivativeSwitchBox"); 40 elt.css("left", Math.min( $(this).offset().left, $(window).width() - elt.outerWidth(true) - 5)) 41 .css("top", $(this).offset().top + $(this).outerHeight(true)) 42 .toggle(); 43 }); 44 $("#derivativeSwitchBox").on("mouseleave click", function() { 45 $(this).hide(); 57 46 }); 58 47 {/literal}{/footer_script} … … 60 49 <span class="pwg-icon pwg-icon-sizes"> </span><span class="pwg-button-text">{'Photo sizes'|@translate}</span> 61 50 </a> 62 <div id="derivativeSwitchBox" class="switchBox" style="display:none">51 <div id="derivativeSwitchBox" class="switchBox"> 63 52 <div class="switchBoxTitle">{'Photo sizes'|@translate}</div> 64 53 {foreach from=$current.unique_derivatives item=derivative key=derivative_type} … … 210 199 {/if} 211 200 {if $display_info.categories and isset($related_categories)} 212 <div id="Categories" 201 <div id="Categories" class="imageInfo"> 213 202 <dt>{'Albums'|@translate}</dt> 214 203 <dd> … … 306 295 elt.style.left = (ePos.offsetLeft)+"px"; 307 296 elt.style.top = (ePos.offsetTop+ePos.offsetHeight)+"px"; 308 elt.style.display=" ";297 elt.style.display="block"; 309 298 } 310 299 else … … 351 340 <div id="commentAdd"> 352 341 <h4>{'Add a comment'|@translate}</h4> 353 <form 342 <form method="post" action="{$comment_add.F_ACTION}" id="addComment" > 354 343 {if $comment_add.SHOW_AUTHOR} 355 <p><label>{'Author'|@translate} :</label></p>344 <p><label>{'Author'|@translate} :</label></p> 356 345 <p><input type="text" name="author" /></p> 357 <p><label>{'Comment'|@translate} :</label></p>346 <p><label>{'Comment'|@translate} :</label></p> 358 347 {/if} 359 348 <p><textarea name="content" id="contentid" rows="5" cols="50">{$comment_add.CONTENT}</textarea></p> 360 349 <p><input type="hidden" name="key" value="{$comment_add.KEY}" /> 361 <input class="submit"type="submit" value="{'Submit'|@translate}"></p>350 <input type="submit" value="{'Submit'|@translate}"></p> 362 351 </form> 363 352 </div> -
trunk/themes/default/theme.css
r13801 r13865 271 271 272 272 .commentElement { 273 border-radius: 5px; 273 274 margin: 5px; 274 275 padding: 2px 0 0 2px; … … 367 368 border-radius: 4px; 368 369 z-index: 100; 369 text-align:left; 370 position: absolute; /*left, right set through js*/ 370 text-align:left; 371 display: none; 372 position: absolute; 373 left: 0; top: 0; /*left, right set through js*/ 371 374 } 372 375 … … 529 532 } 530 533 531 .filter UL {532 margin: 0;533 }534 534 .filter UL, 535 535 .filter LABEL { … … 558 558 /*IE6 needs override because of > selector*/ 559 559 .filter LABEL>INPUT, 560 .filter LABEL>SELECT, 561 .filter LABEL>SPAN, 562 .filter LABEL>TEXTAREA { 560 .filter LABEL>SELECT { 563 561 display: block; 564 562 margin: 0.5em 0; … … 566 564 567 565 .filter FIELDSET * LABEL>INPUT, 568 .filter FIELDSET * LABEL>SELECT, 569 .filter FIELDSET * LABEL>TEXTAREA, 570 .filter SPAN>INPUT, 571 .filter SPAN>SELECT, 572 .filter SPAN>TEXTAREA { 566 .filter FIELDSET * LABEL>SELECT { 573 567 display: inline; 574 568 vertical-align: top; … … 576 570 } 577 571 578 579 580 581 .filter INPUT[type="submit"] {582 margin-top: 1em;583 }584 572 585 573 .properties UL { … … 805 793 806 794 #commentAdd input[type="text"], 807 #commentAdd textarea { 808 max-width: 100%; 809 width: 100%; 810 } 811 812 #pictureCommentList .commentElement { 813 border-radius: 5px; 795 #comments TEXTAREA { 796 max-width: 99%; 797 width: 99%; 814 798 } 815 799 … … 825 809 #pictureCommentList .navigationBar { float: right; margin-bottom: 5px;} 826 810 #pictureComments h4 { margin: 0;} 827 #pictureComments form p { margin: 5px 0; text-align: left;} 828 #pictureComments form p textarea { margin: 10px 0;} 811 #comments FORM P { 812 margin: 5px 0; text-align: left; 813 } 814 829 815 #pictureComments INPUT[type=submit] { margin: 0;} 830 816
Note: See TracChangeset
for help on using the changeset viewer.
