edited by Vincent Massol
on 2011/10/05
on 2011/10/05
Change comment:
Imported from XAR
Summary
-
Page properties (3 modified, 0 added, 0 removed)
-
Objects (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. Admin1 +XWiki.VincentMassol - Default language
-
... ... @@ -1,1 +1,0 @@ 1 -en - Content
-
... ... @@ -23,7 +23,7 @@ 23 23 #elseif($xwiki.exists($newFullName)) 24 24 $response.setStatus(409) 25 25 #error($msg.get('core.rename.alreadyExists', [$newFullName, $xwiki.getURL($newFullName)])) 26 - #elseif(!$xwiki.hasAccessLevel('edit', $context.user, $newFullName)) 26 + #elseif(!$xwiki.hasAccessLevel('edit', $xcontext.user, $newFullName)) 27 27 $response.setStatus(403) 28 28 #error($msg.get('core.rename.targetNotWritable', [$newFullName])) 29 29 #else ... ... @@ -44,9 +44,9 @@ 44 44 #else 45 45 #set($xredirect = ${doc.getURL('view', "xpage=plain&display=list&root=${newCategoryParent}")}) 46 46 #end 47 - $response.sendRedirect($xwiki.getURL($name, 'save', "template=${blogCategoryTemplate}&parent=${newCategoryParent}&${blogCategoryClassname}_0_name=${title}&${blogCategoryClassname}_0_description=&xredirect=$util.encodeURI($xredirect)")) 47 + $response.sendRedirect($xwiki.getURL($name, 'save', "template=${blogCategoryTemplate}&parent=${newCategoryParent}&${blogCategoryClassname}_0_name=${title}&${blogCategoryClassname}_0_description=&xredirect=$util.encodeURI($xredirect)&form_token=$!{services.csrf.getToken()}")) 48 48 #else ## request.ajax 49 - $response.sendRedirect($xwiki.getURL($name, 'save', "template=${blogCategoryTemplate}&parent=${newCategoryParent}&${blogCategoryClassname}_0_name=${title}&${blogCategoryClassname}_0_description=&xredirect=${util.encodeURI(${doc.getURL()})}")) 49 + $response.sendRedirect($xwiki.getURL($name, 'save', "template=${blogCategoryTemplate}&parent=${newCategoryParent}&${blogCategoryClassname}_0_name=${title}&${blogCategoryClassname}_0_description=&xredirect=${util.encodeURI(${doc.getURL()})}&form_token=$!{services.csrf.getToken()}")) 50 50 #end 51 51 #end ## empty title 52 52 #end
- XWiki.JavaScriptExtension[0]
-
- Code
-
... ... @@ -17,7 +17,6 @@ 17 17 /** Constructor. Adds all the JS improvements of the categories tree. */ 18 18 initialize : function() { 19 19 if ($$(".blog-categories-list")) { 20 - this.addHoverListener(); 21 21 this.addDeleteListener(); 22 22 this.addAddSubcategoryListener(); 23 23 this.addAddCategoryListener(); ... ... @@ -32,14 +32,6 @@ 32 32 this.activeForm = form; 33 33 form.down('input[type=text]').focus(); 34 34 }, 35 - addHoverListener : function() { 36 - if (Prototype.Browser.IE) { 37 - $$(this.categoriesSelector).each(function(item) { 38 - item.observe('mouseover', function() {item.addClassName('blog-category-level-hover');}); 39 - item.observe('mouseout', function() {item.removeClassName('blog-category-level-hover');}); 40 - }); 41 - } 42 - }, 43 43 /** 44 44 * Ajax category rename. 45 45 * For all buttons, listen to "click", and make ajax request to rename the category.
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -4,7 +4,7 @@ 4 4 float: left; 5 5 padding: 8px 0; 6 6 } 7 -.subcategories { 7 +.blog-categories-list .subcategories { 8 8 background: $theme.backgroundSecondaryColor; 9 9 margin-top: 1.4em; 10 10 padding-right: 15px; ... ... @@ -14,21 +14,20 @@ 14 14 list-style-type: none !important; 15 15 padding: 0; 16 16 } 17 -.blog-category-level { 17 +.blog-categories-list .blog-category-level { 18 18 padding: 1px 2px 3px; 19 19 display: block; 20 20 position: relative; 21 21 } 22 -.blog-category-level:hover, 23 -.blog-category-level-hover { 22 +.blog-categories-list .blog-category-level:hover { 24 24 background: $theme.highlightColor; 25 25 padding-bottom: 2px; 26 26 border-bottom: 1px solid $theme.borderColor; 27 27 } 28 -.blog-category-level img { 27 +.blog-categories-list .blog-category-level img { 29 29 vertical-align: middle; 30 30 } 31 -.blog-category { 30 +.blog-categories-list .blog-category { 32 32 margin-right: 80px; 33 33 display: block; 34 34 } ... ... @@ -38,8 +38,7 @@ 38 38 top: 0; right: 0; 39 39 display: inline; 40 40 } 41 -.blog-category-level:hover .blog-category-tools, 42 -.blog-category-level-hover .blog-category-tools { 40 +.blog-category-level:hover .blog-category-tools { 43 43 visibility: visible; 44 44 } 45 45 .blog-add-category-label {