Changes for page Macros for the Blog application
Last modified by Vincent Massol on 2023/05/16
Summary
-
Page properties (3 modified, 0 added, 0 removed)
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. VincentMassol1 +XWiki.mflorea - Syntax
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki 2. 01 +XWiki 2.1 - Content
-
... ... @@ -36,24 +36,22 @@ 36 36 ## Keep testing for inline action for backward compatibility with older blogs. 37 37 #if($xcontext.action == 'edit' || $xcontext.action == 'inline') 38 38 #macro(displayProperty $blogDoc $propname) 39 - <dt>#displayPropName($xwiki.getClass($blogClassname).get($propname)):</dt>40 - <dd>$blogDoc.display($propname)</dd>39 + ; #displayPropName($xwiki.getClass($blogClassname).get($propname)): 40 + : $blogDoc.display($propname) 41 41 #end 42 - <dl> 43 - #displayProperty($blogDoc 'title') 44 - #displayProperty($blogDoc 'description') 45 - #displayProperty($blogDoc 'blogType') 46 - #displayProperty($blogDoc 'displayType') 47 - #displayProperty($blogDoc 'itemsPerPage') 48 - </dl> 42 + #displayProperty($blogDoc 'title') 43 + #displayProperty($blogDoc 'description') 44 + #displayProperty($blogDoc 'blogType') 45 + #displayProperty($blogDoc 'displayType') 46 + #displayProperty($blogDoc 'itemsPerPage') 49 49 #else 50 50 $blogDoc.display('description') 51 51 #end 52 52 #elseif($doc.fullName == $blogSheet) 53 -= $ msg.get('xe.blog.code.blogsheet') =54 - $msg.get('xe.blog.code.sheetexplanation')51 += $services.localization.render('xe.blog.code.blogsheet') = 52 + {{translation key='xe.blog.code.sheetexplanation'/}} 55 55 #else 56 - #warning($msg.get('xe.blog.code.notblog'))54 + {{warning}}{{translation key='xe.blog.code.notblog'/}}{{/warning}} 57 57 #end 58 58 #end 59 59 ## ... ... @@ -349,8 +349,8 @@ 349 349 *### 350 350 #macro(displayBlog $entries $displaying $onlyExtract $shouldDisplayTitles) 351 351 #set($blogDay = '') 352 - <divclass="hfeed $!{displaying}">353 - <divclass="blogDay">350 + (% class="hfeed $!{displaying}" %)((( 351 + (% class="blogDay" %)((( 354 354 #foreach ($entryDoc in $xwiki.wrapDocs($entries)) 355 355 #getEntryObject($entryDoc $entryObj) 356 356 ## Although all entries should have one of the two objects, better check to be sure. ... ... @@ -360,8 +360,8 @@ 360 360 #set($entryDateStr = $xwiki.formatDate($entryDate, 'yyyyMMMMdd')) 361 361 #if($blogDay != $entryDateStr) 362 362 #if($blogDay != '') 363 - </div>364 - <divclass="blogDay">361 + ))) 362 + (% class="blogDay" %)((( 365 365 #end 366 366 #displayBlogDate($entryDate) 367 367 #set ($blogDay = $entryDateStr) ... ... @@ -370,8 +370,8 @@ 370 370 #displayEntry($entryDoc $entryObj $onlyExtract $shouldDisplayTitles) 371 371 #end 372 372 #end 373 - </div>## blogDay374 - </div>## hfeed371 + )))## blogDay 372 + )))## hfeed 375 375 #end 376 376 ## 377 377 ## ... ... @@ -421,11 +421,8 @@ 421 421 ## TODO: this could be defined somewhere in the blog style. 422 422 ## #set($month = $xwiki.formatDate($date, 'MMMM')) 423 423 #set($day = $xwiki.formatDate($date, 'dd')) 424 - <h2 class="blogdate">## title="#formatdateISO($date)"> 425 - <span class="month">$month</span> 426 - <span class="day">$day</span> 427 - <span class="year">$year</span> 428 - </h2> 422 + (% class="blogdate" %) 423 + == (% class="month" %)$month(%%) (% class="day" %)$day(%%) (% class="year" %)$year(%%) == 429 429 #end 430 430 ## 431 431 ## ... ... @@ -444,9 +444,9 @@ 444 444 #isPublished($entryObj $isPublished) 445 445 #isHidden($entryObj $isHidden) 446 446 #if($doc.fullName == $entryDoc.fullName) 447 - <divclass="hentry single-article">442 + (% class="hentry single-article" %)((( 448 448 #else 449 - <divclass="hentry#if(!$isPublished) unpublished-article#elseif($isHidden) hidden-article#end">444 + (% class="hentry#if(!$isPublished) unpublished-article#elseif($isHidden) hidden-article#end" %)((( 450 450 #end 451 451 #displayEntryTools($entryDoc $entryObj) 452 452 #if($shouldDisplayTitle) ... ... @@ -454,14 +454,14 @@ 454 454 #end 455 455 #if($doc.fullName == $entryDoc.fullName) 456 456 #if(!$isPublished) 457 - #warning($msg.get('xe.blog.code.published'))452 + {{warning}}{{translation key='xe.blog.code.published'/}}{{/warning}} 458 458 #elseif($isHidden) 459 - #warning($msg.get('xe.blog.code.hidden'))454 + {{warning}}{{translation key='xe.blog.code.hidden'/}}{{/warning}} 460 460 #end 461 461 #end 462 462 #displayEntryContent($entryDoc $entryObj $onlyExtract) 463 463 #displayEntryFooter($entryDoc $entryObj) 464 - </div>## hentry459 + )))## hentry 465 465 #end 466 466 ## 467 467 ## ... ... @@ -512,14 +512,12 @@ 512 512 *### 513 513 #macro(displayEntryTools $entryDoc $entryObj) 514 514 #if($xcontext.action == 'view') 515 - {{html wiki="false"}} 516 - <div class="blog-entry-toolbox"> 510 + (% class="blog-entry-toolbox" %)((( 517 517 #displayPublishButton($entryDoc $entryObj) 518 518 #displayHideShowButton($entryDoc $entryObj) 519 519 #displayEditButton($entryDoc $entryObj) 520 520 #displayDeleteButton($entryDoc $entryObj) 521 - </div> 522 - {{/html}} 515 + ))) 523 523 #end 524 524 #end 525 525 ## ... ... @@ -535,7 +535,7 @@ 535 535 #macro(displayPublishButton $entryDoc $entryObj) 536 536 #isPublished($entryObj $isPublished) 537 537 #if(!$isPublished && $entryDoc.creator == $xcontext.user && $xwiki.hasAccessLevel('edit', $xcontext.user, $entryDoc.fullName)) 538 - <ahref="$blogPublisher.getURL('view', "entryName=${escapetool.url($entryDoc.fullName)}&xredirect=${escapetool.url($thisURL)}&form_token=$!{services.csrf.getToken()}")"title="${escapetool.xml($msg.get('xe.blog.code.notpublished'))}">#toolImage('page_white_world' 'publish ')</a>##531 + [[{{html clean="false"}}#toolImage('page_white_world' 'publish '){{/html}}>>path:$blogPublisher.getURL('view', "entryName=${escapetool.url($entryDoc.fullName)}&xredirect=${escapetool.url($thisURL)}&form_token=$!{services.csrf.getToken()}")||title="${escapetool.xml($services.localization.render('xe.blog.code.notpublished'))}"]]## 539 539 #end 540 540 #end 541 541 ## ... ... @@ -553,9 +553,9 @@ 553 553 ## Only published articles can be hidden. Unpublished articles are considered already hidden. 554 554 #if($isPublished && $entryDoc.creator == $xcontext.user && $xwiki.hasAccessLevel('edit', $xcontext.user, $entryDoc.fullName)) 555 555 #if ($isHidden) 556 - <aclass="blog-tool-show"href="$entryDoc.getURL('save', "${entryObj.getxWikiClass().getName()}_${entryObj.number}_hidden=0&comment=${escapetool.url($msg.get('xe.blog.code.madevisible'))}&xredirect=${escapetool.url($thisURL)}&form_token=$!{services.csrf.getToken()}")" title="${escapetool.xml($msg.get('xe.blog.code.makevisible'))}">#toolImage('lock_open', 'show ')</a>##549 + [[{{html clean="false"}}#toolImage('lock_open', 'show '){{/html}}>>path:$entryDoc.getURL('save', "${entryObj.getxWikiClass().getName()}_${entryObj.number}_hidden=0&comment=${escapetool.url($services.localization.render('xe.blog.code.madevisible'))}&xredirect=${escapetool.url($thisURL)}&form_token=$!{services.csrf.getToken()}")||class="blog-tool-show" title="${escapetool.xml($services.localization.render('xe.blog.code.makevisible'))}"]]## 557 557 #else 558 - <aclass="blog-tool-hide"href="$entryDoc.getURL('save', "${entryObj.getxWikiClass().getName()}_${entryObj.number}_hidden=1&comment=${escapetool.url($msg.get('xe.blog.code.hid'))}&xredirect=${escapetool.url($thisURL)}&form_token=$!{services.csrf.getToken()}")" title="${escapetool.xml($msg.get('xe.blog.code.hide'))}">#toolImage('lock' 'hide ')</a>##551 + [[{{html clean="false"}}#toolImage('lock', 'hide '){{/html}}>>path:$entryDoc.getURL('save', "${entryObj.getxWikiClass().getName()}_${entryObj.number}_hidden=1&comment=${escapetool.url($services.localization.render('xe.blog.code.hid'))}&xredirect=${escapetool.url($thisURL)}&form_token=$!{services.csrf.getToken()}")||class="blog-tool-hide" title="${escapetool.xml($services.localization.render('xe.blog.code.hide'))}"]]## 559 559 #end 560 560 #end 561 561 #end ... ... @@ -571,7 +571,7 @@ 571 571 #macro(displayEditButton $entryDoc $entryObj) 572 572 #if($xwiki.hasAccessLevel('edit', $xcontext.user, $entryDoc.fullName)) 573 573 ## Call getDefaultEditMode() for backward compatibility with older blog posts. 574 - <ahref="$entryDoc.getURL($entryDoc.getDefaultEditMode())"title="${escapetool.xml($msg.get('xe.blog.code.editpost'))}">#toolImage('pencil' 'edit ')</a>##567 + [[{{html clean="false"}}#toolImage('pencil' 'edit '){{/html}}>>path:$entryDoc.getURL('edit')||title="${escapetool.xml($services.localization.render('xe.blog.code.editpost'))}"]]## 575 575 #end 576 576 #end 577 577 ## ... ... @@ -586,7 +586,7 @@ 586 586 *### 587 587 #macro(displayDeleteButton $entryDoc $entryObj) 588 588 #if($xwiki.hasAccessLevel('delete', $xcontext.user, $entryDoc.fullName)) 589 - <ahref="$entryDoc.getURL('delete')"title="${escapetool.xml($msg.get('xe.blog.code.deletepost'))}">#toolImage('cross' 'delete ')</a>##582 + [[{{html clean="false"}}#toolImage('cross' 'delete '){{/html}}>>path:$entryDoc.getURL('delete')||title="${escapetool.xml($services.localization.render('xe.blog.code.deletepost'))}"]]## 590 590 #end 591 591 #end 592 592 ## ... ... @@ -599,13 +599,13 @@ 599 599 * @param entryObj The xobject of the blog post, an instance of the <tt>Blog.BlogPostClass</tt> xclass. 600 600 *### 601 601 #macro(displayEntryTitle $entryDoc $entryObj) 602 - {{html wiki="false"}} 603 603 #if($doc.fullName == $entryDoc.fullName) 604 - <h1 class="entry-title">$entryDoc.display('title', 'view', $entryObj)</h1> 596 + (% class="entry-title" %) 597 + = $entryDoc.display('title', 'view', $entryObj) = 605 605 #else 606 - <h3 class="entry-title"><a href="$entryDoc.getURL()">$entryDoc.display('title', 'view', $entryObj)</a></h3> 599 + (% class="entry-title" %) 600 + === [[$entryDoc.display('title', 'view', $entryObj)>>doc:$entryDoc]] === 607 607 #end 608 - {{/html}} 609 609 #end 610 610 ## 611 611 ## ... ... @@ -618,10 +618,10 @@ 618 618 * @param onlyExtract If <tt>true</tt>, try to display only a summary of the entry, instead of the full content. 619 619 *### 620 620 #macro(displayEntryContent $entryDoc $entryObj $onlyExtract) 621 - <divclass="#if($onlyExtract)entry-summary#{else}entry-content#end">614 + (% class="#if($onlyExtract)entry-summary#{else}entry-content#end" %)((( 622 622 #getEntryContent($entryDoc $entryObj $onlyExtract $entryContent) 623 623 {{html wiki="false"}}$entryDoc.getRenderedContent($entryContent, $entryDoc.syntax.toIdString()){{/html}} 624 - </div>## entry-content617 + ))) ## entry-content 625 625 #end 626 626 ## 627 627 ## ... ... @@ -650,9 +650,9 @@ 650 650 ## *### 651 651 #else 652 652 #if($entryDoc.syntax.toIdString() == 'xwiki/1.0') 653 - #set($result = "${result} <a href='${entryDoc.getURL()}' title='$ msg.get('xe.blog.code.readpost')'>...</a>")646 + #set($result = "${result} <a href='${entryDoc.getURL()}' title='$services.localization.render('xe.blog.code.readpost')'>...</a>") 654 654 #else 655 - #set($result = "${result} [[...>>${entryDoc}||title='$ msg.get('xe.blog.code.readpost')']]")648 + #set($result = "${result} [[...>>${entryDoc}||title='$services.localization.render('xe.blog.code.readpost')']]") 656 656 #end 657 657 #end 658 658 #set ($entryContent = $NULL) ... ... @@ -668,23 +668,23 @@ 668 668 * @param entryObj The xobject of the blog post, an instance of the <tt>Blog.BlogPostClass</tt> xclass. 669 669 *### 670 670 #macro(displayEntryFooter $entryDoc $entryObj) 671 - {{html wiki="false"}} 672 - <div class="entry-footer"> 664 + (% class="entry-footer" %)((( 673 673 #isPublished($entryObj $isPublished) 674 674 #if($isPublished) 675 - $msg.get('xe.blog.code.postedby')##667 + {{translation key='xe.blog.code.postedby'/}} ## 676 676 #else 677 - $msg.get('xe.blog.code.createdby')##669 + {{translation key='xe.blog.code.createdby'/}} ## 678 678 #end 671 + {{html wiki="false"}} 679 679 <address class="author vcard">#userfn($entryDoc.creator)</address> ## 680 680 #getEntryDate($entryDoc $entryObj $entryDate) 681 681 #listCategories($entryObj) ## 682 682 ## Since the publish date and update date are not set at the exact same time, there could be a small difference that 683 683 ## we assume cannot be more than 3 seconds. 684 - <span class="separator">·</span> <a href="$entryDoc.getURL('view')" rel="bookmark">$msg.get('xe.blog.code.permalink')</a> ## 685 - <span class="separator">·</span> <a href="$entryDoc.getURL('view', '#Comments')">$!msg.get('xe.blog.code.comments')</a> <span class="itemCount">($entryDoc.comments.size())</span> ## 686 - </div> ## entry-footer 687 687 {{/html}} 678 + (% class="separator" %)·(%%) [[{{translation key='xe.blog.code.permalink'/}}>>$entryDoc||rel="bookmark"]] ## 679 + (% class="separator" %)·(%%) [[{{translation key='xe.blog.code.comments'/}}>>$entryDoc||anchor="Comments"]] (% class="itemCount" %)($entryDoc.comments.size())(%%) ## 680 + )))## entry-footer 688 688 #end 689 689 ## 690 690 ## ... ... @@ -704,7 +704,7 @@ 704 704 #set($categoryDoc = $!xwiki.getDocument($category)) 705 705 #if(!$categoryDoc.isNew() && $categoryDoc.getObject(${blogCategoryClassname})) 706 706 #if($first) 707 - <span class="separator">·</span> $ msg.get('xe.blog.code.categories')700 + <span class="separator">·</span> $services.localization.render('xe.blog.code.categories') 708 708 #set($first = false) 709 709 #else, #end## if first 710 710 <a rel="tag" href="$xwiki.getURL(${category})">$!{escapetool.xml($!xwiki.getDocument($category).getObject($blogCategoryClassname).getProperty('name').value)}</a>## ... ... @@ -722,26 +722,26 @@ 722 722 * @param blogDoc the XDocument holding the blog definition object. 723 723 *### 724 724 #macro(displayNavigationLinks $blogDoc) 725 - <divclass="clearfloats"></div>718 + (% class="clearfloats" %)((())) 726 726 #getBlogDisplayType($blogDoc $displayType) 727 727 #if($displayType == 'weekly') 728 - <divclass="pagingLinks">721 + (% class="pagingLinks" %)((( 729 729 #getRequestedWeek($weekDate) 730 730 $weekDate.addWeeks(-1)## 731 - (% class="prevPage" %)**[[ «$msg.get('xe.blog.code.previousweek')>>$doc.name?year=$weekDate.weekyear&week=$weekDate.weekOfWeekyear]]**(%%)724 + (% class="prevPage" %)**[[« {{translation key='xe.blog.code.previousweek'/}}>>$doc.name||queryString="year=$weekDate.weekyear&week=$weekDate.weekOfWeekyear"]]**(%%) 732 732 #sep() 733 733 $weekDate.addWeeks(2)## 2 because we already subtracted 1 above 734 - (% class="nextPage" %)**[[ $msg.get('xe.blog.code.nextweek')»>>$doc.name?year=$weekDate.weekyear&week=$weekDate.weekOfWeekyear]]**(%%)735 - </div>727 + (% class="nextPage" %)**[[{{translation key='xe.blog.code.nextweek'/}} »>>$doc.name||queryString="year=$weekDate.weekyear&week=$weekDate.weekOfWeekyear"]]**(%%) 728 + ))) 736 736 #elseif($displayType == 'monthly') 737 - <divclass="pagingLinks">730 + (% class="pagingLinks" %)((( 738 738 #getRequestedMonth($monthDate) 739 739 $monthDate.addMonths(-1)## 740 - (% class="prevPage" %)**[[ «$msg.get('xe.blog.code.previousmonth')>>$doc.name?year=$monthDate.year&month=$monthDate.monthOfYear]]**(%%)733 + (% class="prevPage" %)**[[« {{translation key='xe.blog.code.previousmonth'/}}>>$doc.name||queryString="year=$monthDate.year&month=$monthDate.monthOfYear"]]**(%%) 741 741 #sep() 742 742 $monthDate.addMonths(2)## 2 because we already subtracted 1 above 743 - (% class="nextPage" %)**[[ $msg.get('xe.blog.code.nextmonth')»>>$doc.name?year=$monthDate.year&month=$monthDate.monthOfYear]]**(%%)744 - </div>736 + (% class="nextPage" %)**[[{{translation key='xe.blog.code.nextmonth'/}} »>>$doc.name||queryString="year=$monthDate.year&month=$monthDate.monthOfYear"]]**(%%) 737 + ))) 745 745 #elseif($displayType == 'all') 746 746 #else 747 747 ## Paginated ... ... @@ -754,10 +754,10 @@ 754 754 #end 755 755 #end 756 756 #end 757 - <divclass="pagingLinks">750 + (% class="pagingLinks" %)((( 758 758 #if ($currentPageNumber < $totalPages) 759 759 #set($currentPageNumber = $currentPageNumber + 1) 760 - (% class="prevPage" %)**[[ «$msg.get('xe.blog.code.olderposts')>>$doc.name?page=${currentPageNumber}&ipp=${itemsPerPage}$queryString]]**(%%)753 + (% class="prevPage" %)**[[« {{translation key='xe.blog.code.olderposts'/}}>>$doc.name||queryString="page=${currentPageNumber}&ipp=${itemsPerPage}$queryString"]]**(%%) 761 761 #set($currentPageNumber = $currentPageNumber - 1) 762 762 #end 763 763 #if ($currentPageNumber > 1) ... ... @@ -765,11 +765,11 @@ 765 765 #sep() 766 766 #end 767 767 #set($currentPageNumber = $currentPageNumber - 1) 768 - (% class="nextPage" %)**[[ $msg.get('xe.blog.code.newerposts')»>>$doc.name?page=${currentPageNumber}&ipp=${itemsPerPage}$queryString]]**(%%)761 + (% class="nextPage" %)**[[{{translation key='xe.blog.code.newerposts'/}} »>>$doc.name||queryString="page=${currentPageNumber}&ipp=${itemsPerPage}$queryString"]]**(%%) 769 769 #set($currentPageNumber = $currentPageNumber + 1) 770 770 #end 771 - <spanclass="clear"></span>772 - </div>## pagingLinks764 + (% class="clear" %)(%%) 765 + )))## pagingLinks 773 773 #end 774 774 #end 775 775 #end ... ... @@ -782,7 +782,7 @@ 782 782 * @param message A text message concerning blog article publishing 783 783 *### 784 784 #macro(publishMessageBox $message) 785 - <divclass="plainmessage publish-message">$message</div>778 +(% class="plainmessage publish-message" %)((($message))) 786 786 #end 787 787 #** 788 788 * Displays a message box with "show/hide" icon. ... ... @@ -790,7 +790,7 @@ 790 790 * @param message A text message concerning blog article hiding 791 791 *### 792 792 #macro(hideMessageBox $message) 793 - <divclass="plainmessage hide-message">$message</div>786 +(% class="plainmessage hide-message" %)((($message))) 794 794 #end 795 795 ## 796 796 ## ... ... @@ -860,9 +860,9 @@ 860 860 #macro(blog__actionResponseError $status $text $parameters) 861 861 $response.setStatus($status) 862 862 #if($request.ajax) 863 - $ msg.get($text, $!parameters)856 + $services.localization.render($text, $!parameters) 864 864 #else 865 - {{error}}$ msg.get($text, $!parameters){{/error}}858 + {{error}}$services.localization.render($text, $!parameters){{/error}} 866 866 #end 867 867 #end 868 868 {{/velocity}}